gatsby-core-theme 44.5.1 → 44.5.3
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/.ci.yml +4 -1
- package/CHANGELOG.md +29 -0
- package/package.json +2 -2
- package/src/resolver/modules.mjs +30 -10
- package/src/resolver/operators.mjs +3 -0
- package/src/services/api.mjs +1 -1
- package/storybook/.ci.yml +1 -1
package/.ci.yml
CHANGED
|
@@ -25,7 +25,8 @@ Theme Publish:
|
|
|
25
25
|
tags:
|
|
26
26
|
- gatsby-runner-dev-docker
|
|
27
27
|
before_script:
|
|
28
|
-
- echo "@gigmedia:registry=https://
|
|
28
|
+
- echo "@gigmedia:registry=https://npm.gigmedia.tech/" >> ~/.npmrc
|
|
29
|
+
- echo "//npm.gigmedia.tech/:_authToken=${NPM_PRIVATE_TOKEN}" >> ~/.npmrc
|
|
29
30
|
- echo "//registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}" >> ~/.npmrc
|
|
30
31
|
- git config --global http.sslverify false
|
|
31
32
|
- git config --global user.email "floyd@gig.com"
|
|
@@ -49,6 +50,8 @@ Theme Beta Publish:
|
|
|
49
50
|
tags:
|
|
50
51
|
- gatsby-runner-dev-docker
|
|
51
52
|
before_script:
|
|
53
|
+
- echo "@gigmedia:registry=https://npm.gigmedia.tech/" >> ~/.npmrc
|
|
54
|
+
- echo "//npm.gigmedia.tech/:_authToken=${NPM_PRIVATE_TOKEN}" >> ~/.npmrc
|
|
52
55
|
- git config --global http.sslverify false
|
|
53
56
|
- git config --global user.email "floyd@gig.com"
|
|
54
57
|
- git config --global user.name "floyd"
|
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,32 @@
|
|
|
1
|
+
## [44.5.3](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.5.2...v44.5.3) (2025-10-29)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* add validation when we dont have operator data ([f60e03c](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/f60e03c6bc637cb31ed6ed3c81bc0b118911c8a3))
|
|
7
|
+
* npm token on cicd ([c0f8b55](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/c0f8b558e5dcd8398904140f1c0ed39a42fb6a75))
|
|
8
|
+
* npm token on cicd ([f9db8ff](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/f9db8fffb71b344b22192703d151ba5e62c09420))
|
|
9
|
+
* npm token on cicd ([2ab1d04](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/2ab1d04056f823a2778feed7b0901e0d64cedf92))
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
### Config
|
|
13
|
+
|
|
14
|
+
* update npm registry ([de7abb4](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/de7abb40b897a7ae223fd0e05900358b6caf64cf))
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
* Merge branch 'master' of gitlab.com:g2m-gentoo/team-floyd/themes/gatsby-themes ([60b0f16](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/60b0f167df6b0d677f49e65f304065c50a48109c))
|
|
18
|
+
* Merge branch 'master' of gitlab.com:g2m-gentoo/team-floyd/themes/gatsby-themes ([f9a6eec](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/f9a6eec7de49f16484c469354a23bc64f6c59702))
|
|
19
|
+
|
|
20
|
+
## [44.5.2](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.5.1...v44.5.2) (2025-10-28)
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
### Bug Fixes
|
|
24
|
+
|
|
25
|
+
* fix the logic for the preview ([a9aa055](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/a9aa055d8d686d33494594fb60e98342e84a1518))
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
* Merge branch 'en-160-preview' into 'master' ([4e7e6cb](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/4e7e6cb74294ace70ba99cba91a0220633e17b9f))
|
|
29
|
+
|
|
1
30
|
## [44.5.1](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v44.5.0...v44.5.1) (2025-10-22)
|
|
2
31
|
|
|
3
32
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "gatsby-core-theme",
|
|
3
|
-
"version": "44.5.
|
|
3
|
+
"version": "44.5.3",
|
|
4
4
|
"description": "Gatsby Theme NPM Package",
|
|
5
5
|
"author": "",
|
|
6
6
|
"license": "ISC",
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
21
|
"@reach/router": "^1.3.3",
|
|
22
|
-
"@gigmedia/enigma-utils": "1.
|
|
22
|
+
"@gigmedia/enigma-utils": "^1.20.0",
|
|
23
23
|
"@react-icons/all-files": "^4.1.0",
|
|
24
24
|
"axios": "^0.21.1",
|
|
25
25
|
"chalk": "^4.1.0",
|
package/src/resolver/modules.mjs
CHANGED
|
@@ -314,7 +314,7 @@ export function processCardsV2(
|
|
|
314
314
|
export function processBonus(module, relations) {
|
|
315
315
|
const object = cloneDeep(relations.operator[module.value]);
|
|
316
316
|
|
|
317
|
-
if (object.bonus) {
|
|
317
|
+
if (object && object.bonus) {
|
|
318
318
|
const removeFields =
|
|
319
319
|
settings.remove_bonus_data[process.env.GATSBY_SITE_NAME] ||
|
|
320
320
|
settings.remove_bonus_data.default;
|
|
@@ -525,12 +525,22 @@ export function shouldSavePrefilled(module = {}, siteName) {
|
|
|
525
525
|
);
|
|
526
526
|
}
|
|
527
527
|
|
|
528
|
-
export function processSpotlightModule(module = {}, content) {
|
|
528
|
+
export function processSpotlightModule(module = {}, content, previewPageID) {
|
|
529
529
|
module.items.forEach((item) => {
|
|
530
530
|
item.content = trailingSlash(
|
|
531
|
-
|
|
531
|
+
previewPageID ? item.content : (
|
|
532
|
+
(content &&
|
|
533
|
+
content[item.content]
|
|
534
|
+
)
|
|
535
|
+
) || ""
|
|
536
|
+
);
|
|
537
|
+
item.text = trailingSlash(
|
|
538
|
+
previewPageID ? item.text : (
|
|
539
|
+
(content &&
|
|
540
|
+
content[item.text]
|
|
541
|
+
)
|
|
542
|
+
) || ""
|
|
532
543
|
);
|
|
533
|
-
item.text = trailingSlash((content && content[item.text]) || "");
|
|
534
544
|
});
|
|
535
545
|
|
|
536
546
|
return module;
|
|
@@ -543,22 +553,32 @@ export function processCarouselModule(module = {}, content) {
|
|
|
543
553
|
return module;
|
|
544
554
|
}
|
|
545
555
|
|
|
546
|
-
export function processFaq(module = {}, content, relationData) {
|
|
556
|
+
export function processFaq(module = {}, content, relationData, previewPageID) {
|
|
547
557
|
// eslint-disable-next-line no-unused-expressions
|
|
548
558
|
module.items &&
|
|
549
559
|
// eslint-disable-next-line array-callback-return
|
|
550
560
|
module.items.map((item) => {
|
|
551
561
|
item.question = trailingSlash(
|
|
552
|
-
(
|
|
562
|
+
previewPageID ? generatePlaceholderString(item.question, null, relationData) : (
|
|
563
|
+
(content &&
|
|
553
564
|
generatePlaceholderString(
|
|
554
565
|
content[item.question],
|
|
555
566
|
null,
|
|
556
567
|
relationData
|
|
557
|
-
))
|
|
568
|
+
))
|
|
569
|
+
) ||
|
|
558
570
|
item.question
|
|
559
571
|
);
|
|
560
572
|
item.answer = trailingSlash(
|
|
561
|
-
|
|
573
|
+
previewPageID ? generatePlaceholderString(item.answer, null, relationData) : (
|
|
574
|
+
(content &&
|
|
575
|
+
generatePlaceholderString(
|
|
576
|
+
content[item.answer],
|
|
577
|
+
null,
|
|
578
|
+
relationData
|
|
579
|
+
))
|
|
580
|
+
) ||
|
|
581
|
+
item.answer
|
|
562
582
|
);
|
|
563
583
|
});
|
|
564
584
|
}
|
|
@@ -631,11 +651,11 @@ export function processModule(
|
|
|
631
651
|
translations
|
|
632
652
|
);
|
|
633
653
|
} else if (module.name === "faq") {
|
|
634
|
-
processFaq(module, content, relationData);
|
|
654
|
+
processFaq(module, content, relationData, previewPageID);
|
|
635
655
|
} else if (module.name === "anchor") {
|
|
636
656
|
processAnchor(module, relationData, translations);
|
|
637
657
|
} else if (module.name === "spotlights") {
|
|
638
|
-
processSpotlightModule(module, content);
|
|
658
|
+
processSpotlightModule(module, content, previewPageID);
|
|
639
659
|
} else if (module.name === "menu" && menus && menus[module.menu_id]) {
|
|
640
660
|
module = Object.assign(module, menus[module.menu_id]);
|
|
641
661
|
} else if (module.name === "statistics_counter") {
|
|
@@ -18,6 +18,9 @@ const { cloneDeep, pick } = loadash;
|
|
|
18
18
|
|
|
19
19
|
// eslint-disable-next-line import/prefer-default-export
|
|
20
20
|
export function sanitizeOperatorData(operator, operatorPage = [], data = [], toplistLabel = null) {
|
|
21
|
+
if (!operator) {
|
|
22
|
+
return null;
|
|
23
|
+
}
|
|
21
24
|
const operatorClone = cloneDeep(operator);
|
|
22
25
|
|
|
23
26
|
const { ribbons } = operator;
|
package/src/services/api.mjs
CHANGED
|
@@ -67,7 +67,7 @@ export async function getPages(siteName, previewPath=null) {
|
|
|
67
67
|
if(previewPath) {
|
|
68
68
|
console.log(`v0.1/sites/pages/sorted-v2-preview/${siteName}?path=${previewPath}&non_preview_page_attributes=id,path,market_id,relation_id,relation_type,meta_title,title,type,template_id,market,author_id,banner,featured_image`);
|
|
69
69
|
|
|
70
|
-
return callAPIV2(`v0.1/sites/pages/sorted-v2-preview/${siteName}?path=${previewPath}&non_preview_page_attributes=id,path,market_id,relation_id,relation_type,meta_title,title,type,template_id,market,author_id,banner,featured_image`);
|
|
70
|
+
return callAPIV2(`v0.1/sites/pages/sorted-v2-preview/${siteName}?path=${previewPath}&non_preview_page_attributes=id,path,market_id,relation_id,relation_type,meta_title,title,type,template_id,market,author_id,banner,featured_image,description`);
|
|
71
71
|
}
|
|
72
72
|
return callAPIV2(`v0.1/sites/pages/sorted-v2/${siteName}`);
|
|
73
73
|
}
|
package/storybook/.ci.yml
CHANGED
|
@@ -8,7 +8,7 @@ Storybook Build:
|
|
|
8
8
|
- gatsby-runner-dev-1
|
|
9
9
|
script:
|
|
10
10
|
- yarn config set cache-folder .yarn
|
|
11
|
-
- npm config set //
|
|
11
|
+
- npm config set //npm.gigmedia.tech/:_authToken $NPM_PRIVATE_TOKEN
|
|
12
12
|
- yarn
|
|
13
13
|
- yarn workspace gatsby-core-theme build-storybook -o ./storybook/public
|
|
14
14
|
artifacts:
|