@griddo/cx 1.75.26 → 1.75.28

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@griddo/cx",
3
3
  "description": "Griddo SSG based on Gatsby",
4
- "version": "1.75.26",
4
+ "version": "1.75.28",
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.26",
68
+ "@griddo/eslint-config-back": "^1.75.28",
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": "e870c6671b2c10cf4b9a15f3de4f3c588ea24d34"
100
+ "gitHead": "36cd50155fc2288e033bca6262f9c2bed57e158e"
101
101
  }
@@ -30,9 +30,11 @@ 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(
@@ -77,6 +79,8 @@ export const Head = ({ pageContext }) => {
77
79
  );
78
80
 
79
81
  // Validate options
82
+ const cleanPageLanguages = pageMetadata?.pageLanguages?.filter(item => item.isLive) || [];
83
+
80
84
  const useCanonical =
81
85
  !!pageMetadata?.canonical &&
82
86
  !(
@@ -84,9 +88,13 @@ export const Head = ({ pageContext }) => {
84
88
  pageMetadata?.canonical === fullUrl
85
89
  );
86
90
  const useHrefLangs =
87
- !(siteOptions?.avoidHrefLangsOnCanonicals && useCanonical) &&
91
+ !(
92
+ siteOptions?.avoidHrefLangsOnCanonicals &&
93
+ useCanonical &&
94
+ pageMetadata?.canonical !== fullUrl
95
+ ) &&
88
96
  pageMetadata?.index === 'index' &&
89
- pageMetadata?.pageLanguages?.length > 1;
97
+ cleanPageLanguages.length > 1;
90
98
 
91
99
  return (
92
100
  <>
@@ -96,14 +104,13 @@ export const Head = ({ pageContext }) => {
96
104
  <meta name="title" content={pageMetadata?.title} />
97
105
  )}
98
106
  {siteOptions?.useCanonical && (
99
- <link rel="canonical" href={pageMetadata?.title} />
107
+ <link rel="canonical" href={pageMetadata?.canonical} />
100
108
  )}
101
109
  <link rel="icon" href={faviconResized} />
102
110
 
103
111
  {/* Alternate, solo si se indexa la página y tiene traducciones */}
104
112
  {useHrefLangs &&
105
- pageMetadata?.pageLanguages
106
- .filter(item => item.isLive)
113
+ cleanPageLanguages
107
114
  .map(item => (
108
115
  <link
109
116
  key={item.pageId}
@@ -193,7 +200,7 @@ export default data => {
193
200
 
194
201
  if (!content.dimensions) content.dimensions = [];
195
202
  content.dimensions.values = analyticsDimensions;
196
-
203
+
197
204
  return (
198
205
  <SiteProvider
199
206
  theme={mappedTheme}
@@ -233,4 +240,4 @@ export default data => {
233
240
  />
234
241
  </SiteProvider>
235
242
  );
236
- };
243
+ };