@griddo/cx 1.75.27 → 1.75.29
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +3 -3
- package/src/components/template.js +16 -10
- package/src/utils/helpers.js +1 -1
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@griddo/cx",
|
|
3
3
|
"description": "Griddo SSG based on Gatsby",
|
|
4
|
-
"version": "1.75.
|
|
4
|
+
"version": "1.75.29",
|
|
5
5
|
"authors": [
|
|
6
6
|
"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
|
|
7
7
|
"Carlos Torres <carlos.torres@secuoyas.com>",
|
|
@@ -65,7 +65,7 @@
|
|
|
65
65
|
"react-helmet": "^6.0.0"
|
|
66
66
|
},
|
|
67
67
|
"devDependencies": {
|
|
68
|
-
"@griddo/eslint-config-back": "^1.75.
|
|
68
|
+
"@griddo/eslint-config-back": "^1.75.29",
|
|
69
69
|
"eslint": "^7.5.0",
|
|
70
70
|
"eslint-plugin-node": "^11.1.0",
|
|
71
71
|
"eslint-plugin-react": "7.14.3",
|
|
@@ -97,5 +97,5 @@
|
|
|
97
97
|
"publishConfig": {
|
|
98
98
|
"access": "public"
|
|
99
99
|
},
|
|
100
|
-
"gitHead": "
|
|
100
|
+
"gitHead": "2c3ab7bdfcfeb549a1a486c16fdcb9a046a7b671"
|
|
101
101
|
}
|
|
@@ -30,17 +30,18 @@ export const Head = ({ pageContext }) => {
|
|
|
30
30
|
siteOptions,
|
|
31
31
|
locale,
|
|
32
32
|
openGraph,
|
|
33
|
-
fullUrl,
|
|
34
33
|
analyticsDimensions,
|
|
35
34
|
analyticsScript,
|
|
35
|
+
page: {
|
|
36
|
+
fullUrl,
|
|
37
|
+
},
|
|
36
38
|
} = pageContext;
|
|
37
39
|
|
|
38
40
|
const metaRobots = cleanCommaSeparated(
|
|
39
41
|
`${pageMetadata?.index},${pageMetadata?.follow},${pageMetadata?.translate},${pageMetadata?.metasAdvanced}`
|
|
40
42
|
);
|
|
41
43
|
|
|
42
|
-
const showMetaRobots =
|
|
43
|
-
siteOptions?.showBasicMetaRobots || metaRobots !== 'index,follow,translate';
|
|
44
|
+
const showMetaRobots = !!metaRobots && (siteOptions?.showBasicMetaRobots || metaRobots !== 'index,follow');
|
|
44
45
|
|
|
45
46
|
const emptyCodeScript = { props: { dangerouslySetInnerHTML: {} } };
|
|
46
47
|
|
|
@@ -77,6 +78,8 @@ export const Head = ({ pageContext }) => {
|
|
|
77
78
|
);
|
|
78
79
|
|
|
79
80
|
// Validate options
|
|
81
|
+
const cleanPageLanguages = pageMetadata?.pageLanguages?.filter(item => item.isLive) || [];
|
|
82
|
+
|
|
80
83
|
const useCanonical =
|
|
81
84
|
!!pageMetadata?.canonical &&
|
|
82
85
|
!(
|
|
@@ -84,10 +87,14 @@ export const Head = ({ pageContext }) => {
|
|
|
84
87
|
pageMetadata?.canonical === fullUrl
|
|
85
88
|
);
|
|
86
89
|
const useHrefLangs =
|
|
87
|
-
!(
|
|
90
|
+
!(
|
|
91
|
+
siteOptions?.avoidHrefLangsOnCanonicals &&
|
|
92
|
+
useCanonical &&
|
|
93
|
+
pageMetadata?.canonical !== fullUrl
|
|
94
|
+
) &&
|
|
88
95
|
pageMetadata?.index === 'index' &&
|
|
89
|
-
|
|
90
|
-
|
|
96
|
+
cleanPageLanguages.length > 1;
|
|
97
|
+
|
|
91
98
|
return (
|
|
92
99
|
<>
|
|
93
100
|
<title>{pageMetadata?.title}</title>
|
|
@@ -102,8 +109,7 @@ export const Head = ({ pageContext }) => {
|
|
|
102
109
|
|
|
103
110
|
{/* Alternate, solo si se indexa la página y tiene traducciones */}
|
|
104
111
|
{useHrefLangs &&
|
|
105
|
-
|
|
106
|
-
.filter(item => item.isLive)
|
|
112
|
+
cleanPageLanguages
|
|
107
113
|
.map(item => (
|
|
108
114
|
<link
|
|
109
115
|
key={item.pageId}
|
|
@@ -193,7 +199,7 @@ export default data => {
|
|
|
193
199
|
|
|
194
200
|
if (!content.dimensions) content.dimensions = [];
|
|
195
201
|
content.dimensions.values = analyticsDimensions;
|
|
196
|
-
|
|
202
|
+
|
|
197
203
|
return (
|
|
198
204
|
<SiteProvider
|
|
199
205
|
theme={mappedTheme}
|
|
@@ -233,4 +239,4 @@ export default data => {
|
|
|
233
239
|
/>
|
|
234
240
|
</SiteProvider>
|
|
235
241
|
);
|
|
236
|
-
};
|
|
242
|
+
};
|
package/src/utils/helpers.js
CHANGED
|
@@ -67,7 +67,7 @@ const getPageMetaData = params => {
|
|
|
67
67
|
url,
|
|
68
68
|
index: isIndexed ? 'index' : 'noindex',
|
|
69
69
|
follow: follow ? 'follow' : 'nofollow',
|
|
70
|
-
translate: metasAdvancedList.includes('notranslate') ? 'notranslate' : '
|
|
70
|
+
translate: metasAdvancedList.includes('notranslate') ? 'notranslate' : '',
|
|
71
71
|
metasAdvanced: metasAdvancedList.filter(item => item !== 'notranslate').join(),
|
|
72
72
|
pageLanguages,
|
|
73
73
|
};
|