@gem-sdk/pages 2.1.43 → 2.2.1

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.
@@ -10,6 +10,7 @@ var normalize = require('../helpers/normalize.js');
10
10
  var parseJson = require('../helpers/parse-json.js');
11
11
  var nextjs = require('@sentry/nextjs');
12
12
  var customFonts = require('../custom-fonts.js');
13
+ var genFavicon = require('../helpers/gen-favicon.js');
13
14
 
14
15
  const getStaticPagePropsV2 = (fetcher, shopifyFetcher)=>async (slug)=>{
15
16
  try {
@@ -60,7 +61,7 @@ const getStaticPagePropsV2 = (fetcher, shopifyFetcher)=>async (slug)=>{
60
61
  const thumbnail = parseJson.parseJson(dataBuilder?.themePageDataSEO?.find((item)=>item?.key === 'global-meta-thumbnail')?.value);
61
62
  const shopMeta = shopifyMeta.status === 'fulfilled' ? shopifyMeta.value : undefined;
62
63
  const shopData = storeProperty.status === 'fulfilled' ? storeProperty.value : undefined;
63
- const favicon = shopData?.storeProperty?.favicon ?? '/favicon/favicon-32x32.png';
64
+ const favicon = shopData?.storeProperty?.favicon ?? '';
64
65
  const seo = {
65
66
  defaultTitle: shopMeta?.shop.name,
66
67
  title: dataBuilder?.name,
@@ -85,17 +86,17 @@ const getStaticPagePropsV2 = (fetcher, shopifyFetcher)=>async (slug)=>{
85
86
  {
86
87
  rel: 'icon',
87
88
  sizes: '32x32',
88
- href: `${favicon}-/crop/1:1/center/-/smart_resize/32x32/`
89
+ href: genFavicon.genResizeFaviconUrl(favicon, 32)
89
90
  },
90
91
  {
91
92
  rel: 'icon',
92
93
  sizes: '16x16',
93
- href: `${favicon}-/crop/1:1/center/-/smart_resize/16x16/`
94
+ href: genFavicon.genResizeFaviconUrl(favicon, 16)
94
95
  },
95
96
  {
96
97
  rel: 'apple-touch-icon',
97
98
  sizes: '180x180',
98
- href: `${favicon}-/crop/1:1/center/-/smart_resize/180x180/`
99
+ href: genFavicon.genResizeFaviconUrl(favicon, 180)
99
100
  },
100
101
  {
101
102
  rel: 'manifest',
@@ -110,13 +111,13 @@ const getStaticPagePropsV2 = (fetcher, shopifyFetcher)=>async (slug)=>{
110
111
  description: shopMeta?.shop.description,
111
112
  icons: [
112
113
  {
113
- src: `${favicon}-/crop/1:1/center/-/smart_resize/192x192/`,
114
+ src: genFavicon.genResizeFaviconUrl(favicon, 192),
114
115
  sizes: '192x192',
115
116
  type: 'image/png',
116
117
  purpose: 'any maskable'
117
118
  },
118
119
  {
119
- src: `${favicon}-/crop/1:1/center/-/smart_resize/512x512/`,
120
+ src: genFavicon.genResizeFaviconUrl(favicon, 512),
120
121
  sizes: '512x512',
121
122
  type: 'image/png'
122
123
  }
@@ -0,0 +1,22 @@
1
+ 'use strict';
2
+
3
+ const genResizeFaviconUrl = (faviconUrl, size)=>{
4
+ if (!faviconUrl) {
5
+ return '/favicon/favicon-32x32.png';
6
+ }
7
+ const urlParts = faviconUrl.split('.');
8
+ const extension = urlParts.pop();
9
+ if ([
10
+ 'jpg',
11
+ 'jpeg',
12
+ 'png',
13
+ 'gif',
14
+ 'webp',
15
+ 'ico'
16
+ ].includes(extension?.toLocaleLowerCase())) {
17
+ return `${urlParts.join('.')}_x${size}.${extension}`;
18
+ }
19
+ return faviconUrl;
20
+ };
21
+
22
+ exports.genResizeFaviconUrl = genResizeFaviconUrl;
@@ -8,6 +8,7 @@ import { parseBuilderTemplateV2 } from '../helpers/normalize.js';
8
8
  import { parseJson, serializableJson } from '../helpers/parse-json.js';
9
9
  import { captureException } from '@sentry/nextjs';
10
10
  import { getCustomFonts } from '../custom-fonts.js';
11
+ import { genResizeFaviconUrl } from '../helpers/gen-favicon.js';
11
12
 
12
13
  const getStaticPagePropsV2 = (fetcher, shopifyFetcher)=>async (slug)=>{
13
14
  try {
@@ -58,7 +59,7 @@ const getStaticPagePropsV2 = (fetcher, shopifyFetcher)=>async (slug)=>{
58
59
  const thumbnail = parseJson(dataBuilder?.themePageDataSEO?.find((item)=>item?.key === 'global-meta-thumbnail')?.value);
59
60
  const shopMeta = shopifyMeta.status === 'fulfilled' ? shopifyMeta.value : undefined;
60
61
  const shopData = storeProperty.status === 'fulfilled' ? storeProperty.value : undefined;
61
- const favicon = shopData?.storeProperty?.favicon ?? '/favicon/favicon-32x32.png';
62
+ const favicon = shopData?.storeProperty?.favicon ?? '';
62
63
  const seo = {
63
64
  defaultTitle: shopMeta?.shop.name,
64
65
  title: dataBuilder?.name,
@@ -83,17 +84,17 @@ const getStaticPagePropsV2 = (fetcher, shopifyFetcher)=>async (slug)=>{
83
84
  {
84
85
  rel: 'icon',
85
86
  sizes: '32x32',
86
- href: `${favicon}-/crop/1:1/center/-/smart_resize/32x32/`
87
+ href: genResizeFaviconUrl(favicon, 32)
87
88
  },
88
89
  {
89
90
  rel: 'icon',
90
91
  sizes: '16x16',
91
- href: `${favicon}-/crop/1:1/center/-/smart_resize/16x16/`
92
+ href: genResizeFaviconUrl(favicon, 16)
92
93
  },
93
94
  {
94
95
  rel: 'apple-touch-icon',
95
96
  sizes: '180x180',
96
- href: `${favicon}-/crop/1:1/center/-/smart_resize/180x180/`
97
+ href: genResizeFaviconUrl(favicon, 180)
97
98
  },
98
99
  {
99
100
  rel: 'manifest',
@@ -108,13 +109,13 @@ const getStaticPagePropsV2 = (fetcher, shopifyFetcher)=>async (slug)=>{
108
109
  description: shopMeta?.shop.description,
109
110
  icons: [
110
111
  {
111
- src: `${favicon}-/crop/1:1/center/-/smart_resize/192x192/`,
112
+ src: genResizeFaviconUrl(favicon, 192),
112
113
  sizes: '192x192',
113
114
  type: 'image/png',
114
115
  purpose: 'any maskable'
115
116
  },
116
117
  {
117
- src: `${favicon}-/crop/1:1/center/-/smart_resize/512x512/`,
118
+ src: genResizeFaviconUrl(favicon, 512),
118
119
  sizes: '512x512',
119
120
  type: 'image/png'
120
121
  }
@@ -0,0 +1,20 @@
1
+ const genResizeFaviconUrl = (faviconUrl, size)=>{
2
+ if (!faviconUrl) {
3
+ return '/favicon/favicon-32x32.png';
4
+ }
5
+ const urlParts = faviconUrl.split('.');
6
+ const extension = urlParts.pop();
7
+ if ([
8
+ 'jpg',
9
+ 'jpeg',
10
+ 'png',
11
+ 'gif',
12
+ 'webp',
13
+ 'ico'
14
+ ].includes(extension?.toLocaleLowerCase())) {
15
+ return `${urlParts.join('.')}_x${size}.${extension}`;
16
+ }
17
+ return faviconUrl;
18
+ };
19
+
20
+ export { genResizeFaviconUrl };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gem-sdk/pages",
3
- "version": "2.1.43",
3
+ "version": "2.2.1",
4
4
  "license": "MIT",
5
5
  "sideEffects": false,
6
6
  "main": "dist/cjs/index.js",
@@ -26,7 +26,7 @@
26
26
  "next": "latest"
27
27
  },
28
28
  "devDependencies": {
29
- "@gem-sdk/core": "2.1.40",
29
+ "@gem-sdk/core": "2.2.0",
30
30
  "@gem-sdk/plugin-cookie-bar": "2.1.0",
31
31
  "@gem-sdk/plugin-quick-view": "2.1.0",
32
32
  "@gem-sdk/plugin-sticky-add-to-cart": "2.1.0"