Skip to content

Commit 047de21

Browse files
committed
Merge branch 'main' into pro-8356-match-slug-across-locales
* main: fix tooltip prop (#5139) Radio icon buttons (#5121) Fix typos in some files (#5144) PRO-8571: fix the astro section template library bug introduced in astro 4.9.0 (#5140) bump nodemailer to v7 (#5138) Pro 8563 translation (#5134)
2 parents 89bd6b8 + a82ea56 commit 047de21

19 files changed

Lines changed: 291 additions & 50 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# Changelog
22

3+
## UNRELEASED
4+
5+
### Adds
6+
7+
* Translation strings added for the layout- and layout-column-widgets.
8+
9+
### Changes
10+
11+
* Bump nodemailer to v7.x.
12+
13+
### Fixes
14+
15+
* Specify the content type when calling back to Astro with JSON to render an area. This is required starting in Astro 4.9.0 and up, otherwise the request is blocked by CSRF protection.
16+
* Fixes `AposBreadcrumbSwitch` tooltip prop that is supposed to be an object, not a string. Object returned from the shared method `getOperationTooltip`.
17+
318
## 4.23.0 (2025-10-30)
419

520
### Adds

‎modules/@apostrophecms/area/index.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,9 @@ module.exports = {
376376
const response = await fetch(`${self.apos.baseUrl}/api/apos-external-front/render-area`, {
377377
method: 'POST',
378378
headers: {
379-
'apos-external-front-key': self.apos.externalFrontKey
379+
'apos-external-front-key': self.apos.externalFrontKey,
380+
// Without this Astro enforces CSRF protection starting in version 4.9.0
381+
'content-type': 'application/json'
380382
},
381383
body: JSON.stringify({
382384
area

‎modules/@apostrophecms/area/ui/apos/components/AposBreadcrumbSwitch.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export default {
5151
required: true
5252
},
5353
tooltip: {
54-
type: String,
54+
type: Object,
5555
default: null
5656
},
5757
disabled: {

‎modules/@apostrophecms/asset/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module.exports = {
3131
// If false no UI assets sources will be watched in development.
3232
// This option has no effect in production (watch disabled).
3333
watch: true,
34-
// Miliseconds to wait between asset sources changes before
34+
// Milliseconds to wait between asset sources changes before
3535
// performing a build.
3636
watchDebounceMs: 1000,
3737
// Object containing instructions for remapping existing bundles.

‎modules/@apostrophecms/asset/lib/build/external-module-api.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ function invoke() {
196196
}` + '\n'
197197
: '';
198198

199-
// Remove the identation per line.
199+
// Remove the indentation per line.
200200
// It may look weird, but the result is nice and formatted import file.
201201
output += (js && js.invokeCode.trim().split('\n').map(l => l.trim()).join('\n') + '\n') || '';
202202

‎modules/@apostrophecms/asset/lib/build/internals.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ module.exports = (self) => {
201201
// return a list of all bundle files.
202202
//
203203
// The `bundles` (Set) property added to the entrypoints configuration
204-
// contans the bundle files used later when injecting the scripts and
204+
// contains the bundle files used later when injecting the scripts and
205205
// stylesheets in the browser. The `metadata` is the return value of the
206206
// external build module build method (see `self.build()` and
207207
// `configureBuildModule()`).

‎modules/@apostrophecms/asset/lib/webpack/utils.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ async function verifyBundlesEntryPoints (bundles) {
284284
// already verified it's unique for the given module
285285
if (!remapping.source) {
286286
// Bundle name for "main" "doesn't matter - it will be ignored and
287-
// never built, we want to achieve a free from colision name. What
287+
// never built, we want to achieve a free from collision name. What
288288
// matters is main = true. Target is 'main' by convention:
289289
// `main.bundleName`
290290
bundleName = `${remapping.target}.${bundleName}`;

‎modules/@apostrophecms/doc-type/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2566,7 +2566,7 @@ module.exports = {
25662566
baseQuery.set('choices-query-prefinalize', null);
25672567
for (const filter of filters) {
25682568
// The choices for each filter should reflect the effect of all
2569-
// filters except this one (filtering by topic pares down the list
2569+
// filters except this one (filtering by topic pairs down the list
25702570
// of categories and vice versa)
25712571
const _query = baseQuery.clone();
25722572
// Make sure this is a legitimate builder before attempting to

‎modules/@apostrophecms/doc/index.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ module.exports = {
988988
});
989989
},
990990
// Set meta data for a given field, that will be live under `aposMeta`
991-
// doc property. It returns the path to the meta property withouth the
991+
// doc property. It returns the path to the meta property without the
992992
// key. See `getMetaPath` method for more information.
993993
//
994994
// Signature:
@@ -1196,7 +1196,7 @@ module.exports = {
11961196
// See `setMeta` for more information about `subobject` and
11971197
// `pathComponents` arguments.
11981198
//
1199-
// Returns the path to the meta property withouth the namespace and key.
1199+
// Returns the path to the meta property without the namespace and key.
12001200
// The returned path can be directly used to access or modify the meta
12011201
// property. It's supported by all meta API methods.
12021202
//
@@ -1516,7 +1516,7 @@ module.exports = {
15161516
// the menu will be shown only for docs which have `autopublish: false`
15171517
// and `localized: true` options.
15181518
//
1519-
// `conditions` defines the circumstances under which the opetion should
1519+
// `conditions` defines the circumstances under which the option should
15201520
// be displayed. If all `conditions` are not met, the item is not
15211521
// displayed for this particular document.
15221522
//

‎modules/@apostrophecms/doc/ui/apos/mixins/AposFieldMetaUtilsMixin.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default {
3535
* match a value if a key and value are provided. If no key is provided,
3636
* the namespace is matched.
3737
* Meta keys (inside `metaObject`) starting with '@' are ignored,
38-
* if not explicitely set otherwise, as they are absolute paths
38+
* if not explicitly set otherwise, as they are absolute paths
3939
* and will be yielding false positives.
4040
*
4141
* @param {object} metaObject the meta object or any object inside it

0 commit comments

Comments
 (0)