cloudcommerce 2.6.2 → 2.6.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/CHANGELOG.md +9 -0
- package/ecomplus-stores/barradoce/functions/many/package.json +3 -3
- package/ecomplus-stores/barradoce/functions/ssr/package.json +6 -6
- package/ecomplus-stores/barradoce/functions/ssr/src/components/ProductDetails.vue +2 -1
- package/ecomplus-stores/barradoce/functions/with-apps/package.json +3 -3
- package/ecomplus-stores/barradoce/package.json +2 -2
- package/package.json +2 -2
- package/packages/api/package.json +1 -1
- package/packages/apps/affiliate-program/package.json +1 -1
- package/packages/apps/correios/package.json +1 -1
- package/packages/apps/custom-payment/package.json +1 -1
- package/packages/apps/custom-shipping/package.json +1 -1
- package/packages/apps/datafrete/package.json +1 -1
- package/packages/apps/discounts/package.json +1 -1
- package/packages/apps/emails/package.json +1 -1
- package/packages/apps/fb-conversions/package.json +1 -1
- package/packages/apps/flash-courier/package.json +1 -1
- package/packages/apps/frenet/package.json +1 -1
- package/packages/apps/galaxpay/package.json +1 -1
- package/packages/apps/google-analytics/package.json +1 -1
- package/packages/apps/jadlog/package.json +1 -1
- package/packages/apps/loyalty-points/package.json +1 -1
- package/packages/apps/mandae/package.json +1 -1
- package/packages/apps/melhor-envio/package.json +1 -1
- package/packages/apps/mercadopago/package.json +1 -1
- package/packages/apps/pagarme/package.json +1 -1
- package/packages/apps/pagarme-v5/package.json +1 -1
- package/packages/apps/paghiper/package.json +1 -1
- package/packages/apps/pix/package.json +1 -1
- package/packages/apps/tiny-erp/package.json +1 -1
- package/packages/apps/webhooks/package.json +1 -1
- package/packages/cli/package.json +1 -1
- package/packages/config/package.json +1 -1
- package/packages/emails/package.json +1 -1
- package/packages/eslint/package.json +1 -1
- package/packages/events/package.json +1 -1
- package/packages/feeds/package.json +1 -1
- package/packages/firebase/package.json +1 -1
- package/packages/i18n/package.json +1 -1
- package/packages/modules/package.json +1 -1
- package/packages/passport/package.json +1 -1
- package/packages/ssr/lib/lib/cron-ssr-save-views.js +70 -66
- package/packages/ssr/lib/lib/cron-ssr-save-views.js.map +1 -1
- package/packages/ssr/package.json +3 -3
- package/packages/ssr/src/lib/cron-ssr-save-views.ts +83 -77
- package/packages/storefront/package.json +3 -3
- package/packages/storefront/src/lib/composables/use-breadcrumbs.ts +2 -1
- package/packages/storefront/src/lib/composables/use-search-showcase.ts +2 -1
- package/packages/test-base/package.json +1 -1
- package/packages/types/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,15 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
### [2.6.3](https://github.com/ecomplus/cloud-commerce/compare/v2.6.2...v2.6.3) (2024-02-24)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* **ssr:** Update (PUT) bunny.net perma cache with fresh HTML instead of delete and further get ([46a69eb](https://github.com/ecomplus/cloud-commerce/commit/46a69ebd3808884be74eeaebad0796be7da2e342))
|
|
11
|
+
* **storefront:** Bump Astro to latest v4.4.4 ([7943c78](https://github.com/ecomplus/cloud-commerce/commit/7943c786bcdd2788ac7d29e9e9fb3b06c5422ba9))
|
|
12
|
+
* **storefront:** Prevent warnings with undeclared `cmsPreview` prop on composables for sections ([2b6eec4](https://github.com/ecomplus/cloud-commerce/commit/2b6eec4ad101c252a131de30dbc9fcd9d97dc1d7))
|
|
13
|
+
|
|
5
14
|
### [2.6.2](https://github.com/ecomplus/cloud-commerce/compare/v2.6.1...v2.6.2) (2024-02-24)
|
|
6
15
|
|
|
7
16
|
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
},
|
|
16
16
|
"main": "index.js",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@cloudcommerce/feeds": "^2.6.
|
|
19
|
-
"@cloudcommerce/firebase": "^2.6.
|
|
20
|
-
"@cloudcommerce/passport": "^2.6.
|
|
18
|
+
"@cloudcommerce/feeds": "^2.6.2",
|
|
19
|
+
"@cloudcommerce/firebase": "^2.6.2",
|
|
20
|
+
"@cloudcommerce/passport": "^2.6.2"
|
|
21
21
|
}
|
|
22
22
|
}
|
|
@@ -19,16 +19,16 @@
|
|
|
19
19
|
},
|
|
20
20
|
"main": "index.js",
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@cloudcommerce/api": "^2.6.
|
|
23
|
-
"@cloudcommerce/firebase": "^2.6.
|
|
24
|
-
"@cloudcommerce/ssr": "^2.6.
|
|
22
|
+
"@cloudcommerce/api": "^2.6.2",
|
|
23
|
+
"@cloudcommerce/firebase": "^2.6.2",
|
|
24
|
+
"@cloudcommerce/ssr": "^2.6.2",
|
|
25
25
|
"@headlessui/vue": "^1.7.18",
|
|
26
26
|
"micromark": "^4.0.0"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
|
-
"@cloudcommerce/i18n": "^2.6.
|
|
30
|
-
"@cloudcommerce/storefront": "^2.6.
|
|
31
|
-
"@cloudcommerce/types": "^2.6.
|
|
29
|
+
"@cloudcommerce/i18n": "^2.6.2",
|
|
30
|
+
"@cloudcommerce/storefront": "^2.6.2",
|
|
31
|
+
"@cloudcommerce/types": "^2.6.2",
|
|
32
32
|
"@iconify-json/mingcute": "^1.1.16",
|
|
33
33
|
"photoswipe": "^5.4.3"
|
|
34
34
|
}
|
|
@@ -83,6 +83,7 @@
|
|
|
83
83
|
|
|
84
84
|
<script setup lang="ts">
|
|
85
85
|
import type { ResourceId, Products } from '@cloudcommerce/api/types';
|
|
86
|
+
import type { SectionPreviewProps } from '@@sf/state/use-cms-preview';
|
|
86
87
|
import { useUrlSearchParams } from '@vueuse/core';
|
|
87
88
|
import { addProductToCart } from '@@sf/state/shopping-cart';
|
|
88
89
|
import { useProductCard } from '@@sf/composables/use-product-card';
|
|
@@ -93,7 +94,7 @@ import ImagesGallery from '~/components/ImagesGallery.vue';
|
|
|
93
94
|
import SkuSelector from '~/components/SkuSelector.vue';
|
|
94
95
|
import ShippingCalculator from '~/components/ShippingCalculator.vue';
|
|
95
96
|
|
|
96
|
-
export interface Props {
|
|
97
|
+
export interface Props extends Partial<SectionPreviewProps> {
|
|
97
98
|
product?: Products;
|
|
98
99
|
}
|
|
99
100
|
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
},
|
|
16
16
|
"main": "index.js",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@cloudcommerce/events": "^2.6.
|
|
19
|
-
"@cloudcommerce/firebase": "^2.6.
|
|
20
|
-
"@cloudcommerce/modules": "^2.6.
|
|
18
|
+
"@cloudcommerce/events": "^2.6.2",
|
|
19
|
+
"@cloudcommerce/firebase": "^2.6.2",
|
|
20
|
+
"@cloudcommerce/modules": "^2.6.2"
|
|
21
21
|
}
|
|
22
22
|
}
|
|
@@ -26,10 +26,10 @@
|
|
|
26
26
|
"url": "https://github.com/ecomplus/cloud-commerce/issues"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@cloudcommerce/cli": "^2.6.
|
|
29
|
+
"@cloudcommerce/cli": "^2.6.2"
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
32
|
-
"@cloudcommerce/eslint": "^2.6.
|
|
32
|
+
"@cloudcommerce/eslint": "^2.6.2",
|
|
33
33
|
"husky": "^9.0.10",
|
|
34
34
|
"lint-staged": "^15.2.2"
|
|
35
35
|
}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cloudcommerce",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "2.6.
|
|
4
|
+
"version": "2.6.3",
|
|
5
5
|
"description": "Open fair-code headless commerce platform: API-first, microservices based, event driven and cloud native",
|
|
6
6
|
"main": "packages/api/lib/index.js",
|
|
7
7
|
"author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"vite": "^5.0.11",
|
|
37
37
|
"vitest": "^1.3.0",
|
|
38
38
|
"zx": "^7.2.3",
|
|
39
|
-
"@cloudcommerce/eslint": "2.6.
|
|
39
|
+
"@cloudcommerce/eslint": "2.6.3"
|
|
40
40
|
},
|
|
41
41
|
"scripts": {
|
|
42
42
|
"fix-install": "bash scripts/pre-install.sh && pnpm i",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { getFirestore } from 'firebase-admin/firestore';
|
|
2
|
-
import {
|
|
2
|
+
import { error } from 'firebase-functions/logger';
|
|
3
3
|
import axios from 'axios';
|
|
4
4
|
import api from '@cloudcommerce/api';
|
|
5
5
|
import config from '@cloudcommerce/firebase/lib/config';
|
|
@@ -7,7 +7,7 @@ import { deleteQueryBatch } from '@cloudcommerce/firebase/lib/helpers/firestore'
|
|
|
7
7
|
|
|
8
8
|
const saveViews = async () => {
|
|
9
9
|
const deployRand = process.env.DEPLOY_RAND || '_';
|
|
10
|
-
|
|
10
|
+
const projectId = process.env.GCLOUD_PROJECT;
|
|
11
11
|
const db = getFirestore();
|
|
12
12
|
const productViewsSnapshot = await db.collection('ssrProductViews')
|
|
13
13
|
.limit(500).get();
|
|
@@ -17,7 +17,9 @@ const saveViews = async () => {
|
|
|
17
17
|
if (countUnsaved > 0) {
|
|
18
18
|
const productId = doc.id;
|
|
19
19
|
try {
|
|
20
|
+
// eslint-disable-next-line no-await-in-loop
|
|
20
21
|
const { views } = (await api.get(`products/${productId}`)).data;
|
|
22
|
+
// eslint-disable-next-line no-await-in-loop
|
|
21
23
|
await api.patch(`products/${productId}`, {
|
|
22
24
|
views: countUnsaved + (views || 0),
|
|
23
25
|
});
|
|
@@ -41,27 +43,28 @@ const saveViews = async () => {
|
|
|
41
43
|
},
|
|
42
44
|
});
|
|
43
45
|
try {
|
|
46
|
+
const storageAuthReqs = [];
|
|
44
47
|
if (!bunnyStorageName || !bunnyStoragePass) {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
48
|
+
storageAuthReqs.push(bunnyAxios.get('/storagezone').then(({ data }) => {
|
|
49
|
+
for (let i = 0; i < data.length; i++) {
|
|
50
|
+
const bunnyStorage = data[i];
|
|
51
|
+
if (bunnyStorageName) {
|
|
52
|
+
if (bunnyStorage.Name === bunnyStorageName) {
|
|
53
|
+
bunnyStoragePass = bunnyStorage.Password;
|
|
54
|
+
break;
|
|
55
|
+
}
|
|
56
|
+
continue;
|
|
57
|
+
}
|
|
58
|
+
if (bunnyStorage.Name.startsWith('storefront-isr-')) {
|
|
59
|
+
bunnyStorageName = bunnyStorage.Name;
|
|
50
60
|
bunnyStoragePass = bunnyStorage.Password;
|
|
51
61
|
break;
|
|
52
62
|
}
|
|
53
|
-
continue;
|
|
54
|
-
}
|
|
55
|
-
if (bunnyStorage.Name.startsWith('storefront-isr-')) {
|
|
56
|
-
bunnyStorageName = bunnyStorage.Name;
|
|
57
|
-
bunnyStoragePass = bunnyStorage.Password;
|
|
58
|
-
break;
|
|
59
63
|
}
|
|
60
|
-
}
|
|
64
|
+
}));
|
|
61
65
|
}
|
|
62
|
-
if (
|
|
63
|
-
|
|
64
|
-
const { data } = await bunnyAxios.get('/pullzone');
|
|
66
|
+
if (!bunnyZoneName) {
|
|
67
|
+
storageAuthReqs.push(bunnyAxios.get('/pullzone').then(({ data }) => {
|
|
65
68
|
for (let i = 0; i < data.length; i++) {
|
|
66
69
|
const pullZone = data[i];
|
|
67
70
|
if (pullZone.Hostnames.find(({ Value }) => Value === domain)) {
|
|
@@ -69,20 +72,21 @@ const saveViews = async () => {
|
|
|
69
72
|
break;
|
|
70
73
|
}
|
|
71
74
|
}
|
|
72
|
-
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
75
|
+
}));
|
|
76
|
+
}
|
|
77
|
+
await Promise.all(storageAuthReqs);
|
|
78
|
+
if (bunnyStorageName && bunnyStoragePass && bunnyZoneName) {
|
|
79
|
+
const { data } = await axios({
|
|
80
|
+
url: `https://storage.bunnycdn.com/${bunnyStorageName}/__bcdn_perma_cache__/`,
|
|
81
|
+
headers: {
|
|
82
|
+
AccessKey: bunnyStoragePass,
|
|
83
|
+
},
|
|
84
|
+
});
|
|
85
|
+
for (let i = 0; i < data.length; i++) {
|
|
86
|
+
const { ObjectName } = data[i];
|
|
87
|
+
if (ObjectName.startsWith(`pullzone__${bunnyZoneName}__`)
|
|
88
|
+
&& (!permaCacheZoneFolder || permaCacheZoneFolder < ObjectName)) {
|
|
89
|
+
permaCacheZoneFolder = ObjectName;
|
|
86
90
|
}
|
|
87
91
|
}
|
|
88
92
|
}
|
|
@@ -92,6 +96,7 @@ const saveViews = async () => {
|
|
|
92
96
|
.where('at', '<', new Date(Date.now() - 1000 * sMaxAge))
|
|
93
97
|
.get();
|
|
94
98
|
const purgedUrls = [];
|
|
99
|
+
const purgeReqs = [];
|
|
95
100
|
for (let i = 0; i < pageViewsSnapshot.docs.length; i++) {
|
|
96
101
|
const doc = pageViewsSnapshot.docs[i];
|
|
97
102
|
const data = doc.data();
|
|
@@ -101,47 +106,46 @@ const saveViews = async () => {
|
|
|
101
106
|
const url = data.url.replace(/\?.*$/, '');
|
|
102
107
|
doc.ref.update({ isCachePurged: true });
|
|
103
108
|
if (url?.startsWith(`https://${domain}`) && !purgedUrls.includes(url)) {
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
}),
|
|
112
|
-
];
|
|
109
|
+
purgeReqs.push(bunnyAxios('/purge', {
|
|
110
|
+
method: 'POST',
|
|
111
|
+
params: {
|
|
112
|
+
async: 'false',
|
|
113
|
+
url,
|
|
114
|
+
},
|
|
115
|
+
}));
|
|
113
116
|
purgedUrls.push(url);
|
|
114
117
|
if (permaCacheZoneFolder) {
|
|
115
118
|
let pathname = url.replace(`https://${domain}`, '');
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
119
|
+
const freshHtmlUrl = `https://${projectId}.web.app${pathname}?__isrV=${deployRand}`;
|
|
120
|
+
purgeReqs.push(
|
|
121
|
+
// eslint-disable-next-line no-loop-func
|
|
122
|
+
axios.get(freshHtmlUrl).then(({ data: freshHtml }) => {
|
|
123
|
+
if (pathname.charAt(0) === '/') {
|
|
124
|
+
pathname = pathname.slice(1);
|
|
125
|
+
}
|
|
126
|
+
const paths = pathname.split('/');
|
|
127
|
+
const filename = paths.pop() || '';
|
|
128
|
+
let folderpath = paths.join('/');
|
|
129
|
+
if (folderpath) folderpath += '/';
|
|
130
|
+
// https://support.bunny.net/hc/en-us/articles/360017048720-Perma-Cache-Folder-Structure-Explained
|
|
131
|
+
const permaCachePath = `__bcdn_perma_cache__/${permaCacheZoneFolder}`
|
|
132
|
+
+ `/${folderpath}___${filename}___/___file___`;
|
|
133
|
+
axios({
|
|
134
|
+
method: 'PUT',
|
|
135
|
+
url: `https://storage.bunnycdn.com/${bunnyStorageName}/${permaCachePath}`,
|
|
136
|
+
headers: {
|
|
137
|
+
'Content-Type': 'application/octet-stream',
|
|
138
|
+
Accept: 'application/json',
|
|
139
|
+
AccessKey: bunnyStoragePass,
|
|
140
|
+
},
|
|
141
|
+
data: freshHtml,
|
|
142
|
+
});
|
|
143
|
+
}),
|
|
144
|
+
);
|
|
135
145
|
}
|
|
136
|
-
await Promise.all(reqs).then(([, deletePermaCacheRes]) => {
|
|
137
|
-
if (deletePermaCacheRes) {
|
|
138
|
-
info(`Full cache bump ${url}`);
|
|
139
|
-
return axios.get(`${url}?__isrV=${deployRand}`).catch(error);
|
|
140
|
-
}
|
|
141
|
-
return null;
|
|
142
|
-
});
|
|
143
146
|
}
|
|
144
147
|
}
|
|
148
|
+
await Promise.all(purgeReqs);
|
|
145
149
|
} catch (err) {
|
|
146
150
|
if (err.response) {
|
|
147
151
|
const _err = new Error('Cant purge bunny.net cache');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron-ssr-save-views.js","sourceRoot":"","sources":["../../src/lib/cron-ssr-save-views.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"cron-ssr-save-views.js","sourceRoot":"","sources":["../../src/lib/cron-ssr-save-views.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudcommerce/ssr",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "2.6.
|
|
4
|
+
"version": "2.6.3",
|
|
5
5
|
"description": "E-Com Plus Cloud Commerce storefront SSR",
|
|
6
6
|
"main": "lib/index.js",
|
|
7
7
|
"exports": {
|
|
@@ -26,13 +26,13 @@
|
|
|
26
26
|
"build:workers": "npx tsc -p src/cloudflare --outDir cloudflare && npx eslint --ext .js cloudflare --fix"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@astrojs/node": "8.2.
|
|
29
|
+
"@astrojs/node": "8.2.1",
|
|
30
30
|
"@cloudcommerce/api": "workspace:*",
|
|
31
31
|
"@cloudcommerce/firebase": "workspace:*",
|
|
32
32
|
"@cloudcommerce/i18n": "workspace:*",
|
|
33
33
|
"@ecomplus/utils": "1.5.0-rc.6",
|
|
34
34
|
"@vueuse/core": "10.8.0",
|
|
35
|
-
"astro": "4.4.
|
|
35
|
+
"astro": "4.4.4",
|
|
36
36
|
"astro-capo": "^0.0.1",
|
|
37
37
|
"axios": "^1.6.7",
|
|
38
38
|
"firebase-admin": "^12.0.0",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { getFirestore } from 'firebase-admin/firestore';
|
|
2
|
-
import {
|
|
2
|
+
import { error } from 'firebase-functions/logger';
|
|
3
3
|
import axios from 'axios';
|
|
4
4
|
import api from '@cloudcommerce/api';
|
|
5
5
|
import config from '@cloudcommerce/firebase/lib/config';
|
|
@@ -7,7 +7,7 @@ import { deleteQueryBatch } from '@cloudcommerce/firebase/lib/helpers/firestore'
|
|
|
7
7
|
|
|
8
8
|
const saveViews = async () => {
|
|
9
9
|
const deployRand = process.env.DEPLOY_RAND || '_';
|
|
10
|
-
|
|
10
|
+
const projectId = process.env.GCLOUD_PROJECT as string;
|
|
11
11
|
const db = getFirestore();
|
|
12
12
|
const productViewsSnapshot = await db.collection('ssrProductViews')
|
|
13
13
|
.limit(500).get();
|
|
@@ -17,7 +17,9 @@ const saveViews = async () => {
|
|
|
17
17
|
if (countUnsaved > 0) {
|
|
18
18
|
const productId = doc.id as string & { length: 24 };
|
|
19
19
|
try {
|
|
20
|
+
// eslint-disable-next-line no-await-in-loop
|
|
20
21
|
const { views } = (await api.get(`products/${productId}`)).data;
|
|
22
|
+
// eslint-disable-next-line no-await-in-loop
|
|
21
23
|
await api.patch(`products/${productId}`, {
|
|
22
24
|
views: countUnsaved + (views || 0),
|
|
23
25
|
});
|
|
@@ -41,50 +43,56 @@ const saveViews = async () => {
|
|
|
41
43
|
},
|
|
42
44
|
});
|
|
43
45
|
try {
|
|
46
|
+
const storageAuthReqs: Promise<any>[] = [];
|
|
44
47
|
if (!bunnyStorageName || !bunnyStoragePass) {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
48
|
+
storageAuthReqs.push(
|
|
49
|
+
bunnyAxios.get('/storagezone').then(({ data }) => {
|
|
50
|
+
for (let i = 0; i < data.length; i++) {
|
|
51
|
+
const bunnyStorage = data[i];
|
|
52
|
+
if (bunnyStorageName) {
|
|
53
|
+
if (bunnyStorage.Name === bunnyStorageName) {
|
|
54
|
+
bunnyStoragePass = bunnyStorage.Password;
|
|
55
|
+
break;
|
|
56
|
+
}
|
|
57
|
+
continue;
|
|
58
|
+
}
|
|
59
|
+
if (bunnyStorage.Name.startsWith('storefront-isr-')) {
|
|
60
|
+
bunnyStorageName = bunnyStorage.Name;
|
|
61
|
+
bunnyStoragePass = bunnyStorage.Password;
|
|
62
|
+
break;
|
|
63
|
+
}
|
|
52
64
|
}
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
if (bunnyStorage.Name.startsWith('storefront-isr-')) {
|
|
56
|
-
bunnyStorageName = bunnyStorage.Name;
|
|
57
|
-
bunnyStoragePass = bunnyStorage.Password;
|
|
58
|
-
break;
|
|
59
|
-
}
|
|
60
|
-
}
|
|
65
|
+
}),
|
|
66
|
+
);
|
|
61
67
|
}
|
|
62
|
-
if (
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
if (bunnyZoneName) {
|
|
74
|
-
const { data } = await axios({
|
|
75
|
-
url: `https://storage.bunnycdn.com/${bunnyStorageName}/__bcdn_perma_cache__/`,
|
|
76
|
-
headers: {
|
|
77
|
-
AccessKey: bunnyStoragePass,
|
|
78
|
-
},
|
|
79
|
-
});
|
|
80
|
-
for (let i = 0; i < data.length; i++) {
|
|
81
|
-
const { ObjectName } = data[i];
|
|
82
|
-
if (
|
|
83
|
-
ObjectName.startsWith(`pullzone__${bunnyZoneName}__`)
|
|
84
|
-
&& (!permaCacheZoneFolder || permaCacheZoneFolder < ObjectName)
|
|
85
|
-
) {
|
|
86
|
-
permaCacheZoneFolder = ObjectName;
|
|
68
|
+
if (!bunnyZoneName) {
|
|
69
|
+
storageAuthReqs.push(
|
|
70
|
+
bunnyAxios.get('/pullzone').then(({ data }) => {
|
|
71
|
+
for (let i = 0; i < data.length; i++) {
|
|
72
|
+
const pullZone = data[i];
|
|
73
|
+
if (pullZone.Hostnames.find(({ Value }) => Value === domain)) {
|
|
74
|
+
bunnyZoneName = pullZone.Name;
|
|
75
|
+
break;
|
|
76
|
+
}
|
|
87
77
|
}
|
|
78
|
+
}),
|
|
79
|
+
);
|
|
80
|
+
}
|
|
81
|
+
await Promise.all(storageAuthReqs);
|
|
82
|
+
if (bunnyStorageName && bunnyStoragePass && bunnyZoneName) {
|
|
83
|
+
const { data } = await axios({
|
|
84
|
+
url: `https://storage.bunnycdn.com/${bunnyStorageName}/__bcdn_perma_cache__/`,
|
|
85
|
+
headers: {
|
|
86
|
+
AccessKey: bunnyStoragePass,
|
|
87
|
+
},
|
|
88
|
+
});
|
|
89
|
+
for (let i = 0; i < data.length; i++) {
|
|
90
|
+
const { ObjectName } = data[i];
|
|
91
|
+
if (
|
|
92
|
+
ObjectName.startsWith(`pullzone__${bunnyZoneName}__`)
|
|
93
|
+
&& (!permaCacheZoneFolder || permaCacheZoneFolder < ObjectName)
|
|
94
|
+
) {
|
|
95
|
+
permaCacheZoneFolder = ObjectName;
|
|
88
96
|
}
|
|
89
97
|
}
|
|
90
98
|
}
|
|
@@ -94,6 +102,7 @@ const saveViews = async () => {
|
|
|
94
102
|
.where('at', '<', new Date(Date.now() - 1000 * sMaxAge))
|
|
95
103
|
.get();
|
|
96
104
|
const purgedUrls: string[] = [];
|
|
105
|
+
const purgeReqs: Promise<any>[] = [];
|
|
97
106
|
for (let i = 0; i < pageViewsSnapshot.docs.length; i++) {
|
|
98
107
|
const doc = pageViewsSnapshot.docs[i];
|
|
99
108
|
const data = doc.data() as { url: string, isCachePurged?: true };
|
|
@@ -103,49 +112,46 @@ const saveViews = async () => {
|
|
|
103
112
|
const url = data.url.replace(/\?.*$/, '');
|
|
104
113
|
doc.ref.update({ isCachePurged: true });
|
|
105
114
|
if (url?.startsWith(`https://${domain}`) && !purgedUrls.includes(url)) {
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
}),
|
|
114
|
-
];
|
|
115
|
+
purgeReqs.push(bunnyAxios('/purge', {
|
|
116
|
+
method: 'POST',
|
|
117
|
+
params: {
|
|
118
|
+
async: 'false',
|
|
119
|
+
url,
|
|
120
|
+
},
|
|
121
|
+
}));
|
|
115
122
|
purgedUrls.push(url);
|
|
116
123
|
if (permaCacheZoneFolder) {
|
|
117
124
|
let pathname = url.replace(`https://${domain}`, '');
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
125
|
+
const freshHtmlUrl = `https://${projectId}.web.app${pathname}?__isrV=${deployRand}`;
|
|
126
|
+
purgeReqs.push(
|
|
127
|
+
// eslint-disable-next-line no-loop-func
|
|
128
|
+
axios.get(freshHtmlUrl).then(({ data: freshHtml }: { data: string }) => {
|
|
129
|
+
if (pathname.charAt(0) === '/') {
|
|
130
|
+
pathname = pathname.slice(1);
|
|
131
|
+
}
|
|
132
|
+
const paths = pathname.split('/');
|
|
133
|
+
const filename = paths.pop() || '';
|
|
134
|
+
let folderpath = paths.join('/');
|
|
135
|
+
if (folderpath) folderpath += '/';
|
|
136
|
+
// https://support.bunny.net/hc/en-us/articles/360017048720-Perma-Cache-Folder-Structure-Explained
|
|
137
|
+
const permaCachePath = `__bcdn_perma_cache__/${permaCacheZoneFolder}`
|
|
138
|
+
+ `/${folderpath}___${filename}___/___file___`;
|
|
139
|
+
axios({
|
|
140
|
+
method: 'PUT',
|
|
141
|
+
url: `https://storage.bunnycdn.com/${bunnyStorageName}/${permaCachePath}`,
|
|
142
|
+
headers: {
|
|
143
|
+
'Content-Type': 'application/octet-stream',
|
|
144
|
+
Accept: 'application/json',
|
|
145
|
+
AccessKey: bunnyStoragePass,
|
|
146
|
+
},
|
|
147
|
+
data: freshHtml,
|
|
148
|
+
});
|
|
137
149
|
}),
|
|
138
150
|
);
|
|
139
151
|
}
|
|
140
|
-
await Promise.all(reqs).then(([, deletePermaCacheRes]) => {
|
|
141
|
-
if (deletePermaCacheRes) {
|
|
142
|
-
info(`Full cache bump ${url}`);
|
|
143
|
-
return axios.get(`${url}?__isrV=${deployRand}`).catch(error);
|
|
144
|
-
}
|
|
145
|
-
return null;
|
|
146
|
-
});
|
|
147
152
|
}
|
|
148
153
|
}
|
|
154
|
+
await Promise.all(purgeReqs);
|
|
149
155
|
} catch (err: any) {
|
|
150
156
|
if (err.response) {
|
|
151
157
|
const _err: any = new Error('Cant purge bunny.net cache');
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudcommerce/storefront",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "2.6.
|
|
4
|
+
"version": "2.6.3",
|
|
5
5
|
"description": "E-Com Plus Cloud Commerce storefront with Astro",
|
|
6
6
|
"bin": {
|
|
7
7
|
"storefront": "./scripts/build-prod.sh"
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"lint:fix": "eslint -c ../eslint/storefront.staged.eslintrc.cjs src/lib/**/*.{ts,vue,astro} --fix"
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@astrojs/node": "8.2.
|
|
33
|
+
"@astrojs/node": "8.2.1",
|
|
34
34
|
"@astrojs/vue": "4.0.8",
|
|
35
35
|
"@cloudcommerce/api": "workspace:*",
|
|
36
36
|
"@cloudcommerce/config": "workspace:*",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"@vite-pwa/astro": "^0.3.0",
|
|
45
45
|
"@vueuse/core": "10.8.0",
|
|
46
46
|
"@webcontainer/api": "^1.1.9",
|
|
47
|
-
"astro": "4.4.
|
|
47
|
+
"astro": "4.4.4",
|
|
48
48
|
"astro-capo": "^0.0.1",
|
|
49
49
|
"chroma-js": "^2.4.2",
|
|
50
50
|
"dotenv": "^16.4.4",
|
|
@@ -4,13 +4,14 @@ import type {
|
|
|
4
4
|
Brands,
|
|
5
5
|
Collections,
|
|
6
6
|
} from '@cloudcommerce/api/types';
|
|
7
|
+
import type { SectionPreviewProps } from '@@sf/state/use-cms-preview';
|
|
7
8
|
import {
|
|
8
9
|
name as getName,
|
|
9
10
|
categoriesList as getCategoriesList,
|
|
10
11
|
} from '@ecomplus/utils';
|
|
11
12
|
import useSharedData from '@@sf/composables/use-shared-data';
|
|
12
13
|
|
|
13
|
-
export interface Props {
|
|
14
|
+
export interface Props extends Partial<SectionPreviewProps> {
|
|
14
15
|
apiDoc?: Partial<Products | Categories | Brands | Collections>;
|
|
15
16
|
categories?: Partial<Categories>[];
|
|
16
17
|
domain?: string;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { Ref } from 'vue';
|
|
2
2
|
import type { SearchItem } from '@cloudcommerce/types';
|
|
3
3
|
import type { SearchEngineInstance } from '@@sf/state/search-engine';
|
|
4
|
+
import type { SectionPreviewProps } from '@@sf/state/use-cms-preview';
|
|
4
5
|
import {
|
|
5
6
|
ref,
|
|
6
7
|
computed,
|
|
@@ -21,7 +22,7 @@ import {
|
|
|
21
22
|
import { SearchEngine } from '@@sf/state/search-engine';
|
|
22
23
|
import { useSearchActiveFilters } from '@@sf/composables/use-search-filters';
|
|
23
24
|
|
|
24
|
-
export interface Props {
|
|
25
|
+
export interface Props extends Partial<SectionPreviewProps> {
|
|
25
26
|
term?: string | null;
|
|
26
27
|
pageSize?: number;
|
|
27
28
|
fixedParams?: SearchEngineInstance['params'];
|