Skip to content

Commit b181874

Browse files
author
ws2-release-bot
committed
Merge branch version-2.19 into main
1 parent 9274308 commit b181874

98 files changed

Lines changed: 5318 additions & 3248 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
# Webspark profile
32

43
## Description
@@ -7,6 +6,7 @@ Webspark profile installs all the required modules and configurations for the
76
webspark distribution.
87

98
## How to install
9+
1010
- For an initial install, follow the instructions in the INSTALL-INSTRUCTIONS.md file.
1111

1212
## Features
@@ -15,7 +15,6 @@ webspark distribution.
1515
- Comes with updates that will periodically improve the experience
1616
- Has some predefined configurations on blocks, users, ckeditor profiles, system settings, etc.
1717

18-
1918
## Requirements
2019

2120
Drupal 10 or higher
@@ -38,10 +37,10 @@ Both folders live inside the profile and are the **source of truth**. They are
3837
copied out to the repository root, where they are renamed (the `-source` suffix is
3938
dropped):
4039

41-
| Profile source folder | Root destination | How it gets there |
42-
|---------------------------------| ------------------------- | ------------------------------------------------------------ |
43-
| `webspark-dependencies-source/` | `webspark-dependencies/` | Automatically rsynced on every `composer install`/`update`. |
44-
| `custom-dependencies-source/` | `custom-dependencies/` | Copied **once** by hand during install, then owned by the site. |
40+
| Profile source folder | Root destination | How it gets there |
41+
| ------------------------------- | ------------------------ | --------------------------------------------------------------- |
42+
| `webspark-dependencies-source/` | `webspark-dependencies/` | Automatically rsynced on every `composer install`/`update`. |
43+
| `custom-dependencies-source/` | `custom-dependencies/` | Copied **once** by hand during install, then owned by the site. |
4544

4645
- `webspark-dependencies/` is **upstream-owned**. It is overwritten on every Composer
4746
run, so do **not** edit anything in it at the individual site level — your changes will be lost. Upstream changes belong in
@@ -57,11 +56,11 @@ dropped):
5756
The root `composer.json` `scripts` section wires the process into Composer's
5857
lifecycle:
5958

60-
- `WebsparkCustomScripts\ComposerScripts::writeComposerPatchFile` — merges
61-
`webspark-dependencies/patches.webspark.json` (upstream) and
62-
`custom-dependencies/patches.custom.json` (site) into the root
63-
`composer.patches.json`. That root file is generated; edit the source patch
64-
files instead.
59+
- `WebsparkCustomScripts\ComposerScripts::writeComposerPatchFile` — merges
60+
`webspark-dependencies/patches.webspark.json` (upstream) and
61+
`custom-dependencies/patches.custom.json` (site) into the root
62+
`composer.patches.json`. That root file is generated; edit the source patch
63+
files instead.
6564
- **`post-update-cmd`** runs after `composer update` and **`post-install-cmd`** runs
6665
after `composer install`. Both start by running the
6766
`docroot/profiles/contrib/webspark/sync-dependencies` script (the actual file sync,
@@ -98,14 +97,14 @@ When it runs locally it performs the following steps:
9897
live for the repository to work, and the source copy under
9998
`webspark-dependencies/scripts/` is deleted after each move:
10099

101-
| Synced source file | Final destination | Behavior |
102-
| ------------------------------------------ | ------------------------------------------ | ---------------------------------------------------------------------------------------------- |
103-
| `scripts/pre-commit` | `.git/hooks/pre-commit` | Installs the hook, or merges the `asu_commit_check` function into an existing hook. |
104-
| `scripts/post-commit` | `.git/hooks/post-commit` | Installs the hook, or merges the `asu_post_commit_actions` function into an existing hook. |
105-
| `scripts/.prettierignore` | root `.prettierignore` | Copied to the repository root. |
106-
| `scripts/prettierrc.js` | root `.prettierrc.js` | Copied to the repository root. |
107-
| `scripts/.root-gitignore` | root `.gitignore` | Ensures the `/node_modules` and `!/package.json` rules exist (appends them if missing). |
108-
| `scripts/package.json` | root `package.json` | Creates the root `package.json`, or merges the `prettier` devDependency into an existing one. |
100+
| Synced source file | Final destination | Behavior |
101+
| ------------------------- | ------------------------ | --------------------------------------------------------------------------------------------- |
102+
| `scripts/pre-commit` | `.git/hooks/pre-commit` | Installs the hook, or merges the `asu_commit_check` function into an existing hook. |
103+
| `scripts/post-commit` | `.git/hooks/post-commit` | Installs the hook, or merges the `asu_post_commit_actions` function into an existing hook. |
104+
| `scripts/.prettierignore` | root `.prettierignore` | Copied to the repository root. |
105+
| `scripts/prettierrc.js` | root `.prettierrc.js` | Copied to the repository root. |
106+
| `scripts/.root-gitignore` | root `.gitignore` | Ensures the `/node_modules` and `!/package.json` rules exist (appends them if missing). |
107+
| `scripts/package.json` | root `package.json` | Creates the root `package.json`, or merges the `prettier` devDependency into an existing one. |
109108

110109
4. **Align `drupal/core-dev`.** `sync_core_dev` reads the installed
111110
`drupal/core-recommended` version from `composer.lock` and adds/updates a matching

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"drupal/components": "3.2.0",
1919
"drupal/config_readonly": "1.0.0-beta5",
2020
"drupal/config_update": "2.0.0-alpha3",
21-
"drupal/core-composer-scaffold": "10.5.11",
22-
"drupal/core-recommended": "10.5.11",
21+
"drupal/core-composer-scaffold": "10.6.13",
22+
"drupal/core-recommended": "10.6.13",
2323
"drupal/crop": "2.3.0",
2424
"drupal/ctools": "4.1.0",
2525
"drupal/current_page_crumb": "1.5.0",
@@ -43,7 +43,7 @@
4343
"drupal/maxlength": "2.1.2",
4444
"drupal/media_library_form_element": "2.1.0",
4545
"drupal/metatag": "2.2.0",
46-
"drupal/paragraphs": "1.17.0",
46+
"drupal/paragraphs": "1.21.0",
4747
"drupal/pathauto": "1.13.0",
4848
"drupal/radix": "5.0.11",
4949
"drupal/redirect": "1.9.0",

config/install/core.entity_form_display.block_content.events.default.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ dependencies:
1010
- field.field.block_content.events.field_events_header_text_color
1111
- field.field.block_content.events.field_events_heading
1212
- field.field.block_content.events.field_events_items_to_display
13+
- field.field.block_content.events.field_events_no_results
1314
- field.field.block_content.events.field_feed_taxonomy_term
1415
- field.field.block_content.events.field_spacing_bottom
1516
- field.field.block_content.events.field_spacing_top
@@ -95,6 +96,14 @@ content:
9596
region: content
9697
settings: { }
9798
third_party_settings: { }
99+
field_events_no_results:
100+
type: string_textarea
101+
weight: 10
102+
region: content
103+
settings:
104+
rows: 3
105+
placeholder: ''
106+
third_party_settings: { }
98107
field_feed_taxonomy_term:
99108
type: string_textfield
100109
weight: 1

config/install/core.entity_form_display.node.article.default.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ status: true
33
dependencies:
44
config:
55
- field.field.node.article.body
6+
- field.field.node.article.field_article_tags
67
- field.field.node.article.field_author
78
- field.field.node.article.field_byline
9+
- field.field.node.article.field_cta_link
810
- field.field.node.article.field_date_published
911
- field.field.node.article.field_header_style
1012
- field.field.node.article.field_media
@@ -15,6 +17,7 @@ dependencies:
1517
- datetime
1618
- field_group
1719
- field_states_ui
20+
- link
1821
- maxlength
1922
- media_library
2023
- path
@@ -77,6 +80,16 @@ content:
7780
region: content
7881
settings: { }
7982
third_party_settings: { }
83+
field_article_tags:
84+
type: entity_reference_autocomplete
85+
weight: 26
86+
region: content
87+
settings:
88+
match_operator: CONTAINS
89+
match_limit: 10
90+
size: 60
91+
placeholder: ''
92+
third_party_settings: { }
8093
field_author:
8194
type: string_textfield
8295
weight: 3
@@ -106,6 +119,14 @@ content:
106119
maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>'
107120
maxlength_js_enforce: false
108121
maxlength_js_truncate_html: false
122+
field_cta_link:
123+
type: link_default
124+
weight: 27
125+
region: content
126+
settings:
127+
placeholder_url: ''
128+
placeholder_title: ''
129+
third_party_settings: { }
109130
field_date_published:
110131
type: datetime_default
111132
weight: 4

config/install/core.entity_view_display.node.article.default.yml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ status: true
33
dependencies:
44
config:
55
- field.field.node.article.body
6+
- field.field.node.article.field_article_tags
67
- field.field.node.article.field_author
78
- field.field.node.article.field_byline
9+
- field.field.node.article.field_cta_link
810
- field.field.node.article.field_date_published
911
- field.field.node.article.field_header_style
1012
- field.field.node.article.field_media
@@ -14,6 +16,7 @@ dependencies:
1416
- datetime
1517
- layout_builder
1618
- layout_builder_restrictions
19+
- link
1720
- options
1821
- text
1922
- user
@@ -159,6 +162,42 @@ third_party_settings:
159162
third_party_settings: { }
160163
weight: 7
161164
additional: { }
165+
318ba129-4fdf-4e72-9465-4382f2633674:
166+
uuid: 318ba129-4fdf-4e72-9465-4382f2633674
167+
region: first
168+
configuration:
169+
id: 'field_block:node:article:field_article_tags'
170+
label_display: '0'
171+
context_mapping:
172+
entity: layout_builder.entity
173+
formatter:
174+
type: entity_reference_label
175+
label: above
176+
settings:
177+
link: true
178+
third_party_settings: { }
179+
weight: 8
180+
additional: { }
181+
f8ca89dd-1186-4fa6-806d-4d865b0705e8:
182+
uuid: f8ca89dd-1186-4fa6-806d-4d865b0705e8
183+
region: first
184+
configuration:
185+
id: 'field_block:node:article:field_cta_link'
186+
label_display: '0'
187+
context_mapping:
188+
entity: layout_builder.entity
189+
formatter:
190+
type: link
191+
label: above
192+
settings:
193+
trim_length: 80
194+
url_only: false
195+
url_plain: false
196+
rel: ''
197+
target: ''
198+
third_party_settings: { }
199+
weight: 9
200+
additional: { }
162201
third_party_settings: { }
163202
layout_builder_restrictions:
164203
allowed_block_categories: { }
@@ -195,6 +234,14 @@ content:
195234
third_party_settings: { }
196235
weight: 103
197236
region: first
237+
field_article_tags:
238+
type: entity_reference_label
239+
label: above
240+
settings:
241+
link: true
242+
third_party_settings: { }
243+
weight: 107
244+
region: first
198245
field_author:
199246
type: string
200247
label: above
@@ -210,6 +257,18 @@ content:
210257
third_party_settings: { }
211258
weight: 104
212259
region: first
260+
field_cta_link:
261+
type: link
262+
label: above
263+
settings:
264+
trim_length: 80
265+
url_only: false
266+
url_plain: false
267+
rel: ''
268+
target: ''
269+
third_party_settings: { }
270+
weight: 108
271+
region: first
213272
field_date_published:
214273
type: datetime_default
215274
label: above

config/install/core.entity_view_display.node.article.rss.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ dependencies:
44
config:
55
- core.entity_view_mode.node.rss
66
- field.field.node.article.body
7+
- field.field.node.article.field_article_tags
78
- field.field.node.article.field_author
89
- field.field.node.article.field_byline
10+
- field.field.node.article.field_cta_link
911
- field.field.node.article.field_date_published
1012
- field.field.node.article.field_header_style
1113
- field.field.node.article.field_media
@@ -23,8 +25,10 @@ content:
2325
region: content
2426
hidden:
2527
body: true
28+
field_article_tags: true
2629
field_author: true
2730
field_byline: true
31+
field_cta_link: true
2832
field_date_published: true
2933
field_header_style: true
3034
field_media: true

config/install/core.entity_view_display.node.article.teaser.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ dependencies:
44
config:
55
- core.entity_view_mode.node.teaser
66
- field.field.node.article.body
7+
- field.field.node.article.field_article_tags
78
- field.field.node.article.field_author
89
- field.field.node.article.field_byline
10+
- field.field.node.article.field_cta_link
911
- field.field.node.article.field_date_published
1012
- field.field.node.article.field_header_style
1113
- field.field.node.article.field_media
@@ -23,8 +25,10 @@ content:
2325
region: content
2426
hidden:
2527
body: true
28+
field_article_tags: true
2629
field_author: true
2730
field_byline: true
31+
field_cta_link: true
2832
field_date_published: true
2933
field_header_style: true
3034
field_media: true

config/install/field.field.node.article.body.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ translatable: true
1717
default_value: { }
1818
default_value_callback: ''
1919
settings:
20-
display_summary: false
20+
display_summary: true
2121
required_summary: false
2222
allowed_formats: { }
2323
field_type: text_with_summary
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
langcode: en
2+
status: true
3+
dependencies:
4+
config:
5+
- field.storage.node.field_article_tags
6+
- node.type.article
7+
- taxonomy.vocabulary.tags
8+
id: node.article.field_article_tags
9+
field_name: field_article_tags
10+
entity_type: node
11+
bundle: article
12+
label: Tags
13+
description: ''
14+
required: false
15+
translatable: false
16+
default_value: { }
17+
default_value_callback: ''
18+
settings:
19+
handler: 'default:taxonomy_term'
20+
handler_settings:
21+
target_bundles:
22+
tags: tags
23+
sort:
24+
field: name
25+
direction: asc
26+
auto_create: true
27+
auto_create_bundle: ''
28+
field_type: entity_reference
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
langcode: en
2+
status: true
3+
dependencies:
4+
config:
5+
- field.storage.node.field_cta_link
6+
- node.type.article
7+
module:
8+
- link
9+
id: node.article.field_cta_link
10+
field_name: field_cta_link
11+
entity_type: node
12+
bundle: article
13+
label: 'CTA link'
14+
description: ''
15+
required: false
16+
translatable: false
17+
default_value: { }
18+
default_value_callback: ''
19+
settings:
20+
title: 2
21+
link_type: 17
22+
field_type: link

0 commit comments

Comments
 (0)