cloudcommerce 2.2.2 → 2.3.0
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 +24 -0
- package/ecomplus-stores/barra-doce/functions/many/package.json +3 -3
- package/ecomplus-stores/barra-doce/functions/ssr/package.json +6 -6
- package/ecomplus-stores/barra-doce/functions/with-apps/package.json +3 -3
- package/ecomplus-stores/barra-doce/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/lib/firebase/handle-module.js +28 -7
- package/packages/modules/lib/firebase/handle-module.js.map +1 -1
- package/packages/modules/package.json +1 -1
- package/packages/modules/src/firebase/handle-module.ts +37 -9
- package/packages/passport/package.json +1 -1
- package/packages/ssr/lib/lib/cron-ssr-save-views.js +11 -3
- package/packages/ssr/lib/lib/cron-ssr-save-views.js.map +1 -1
- package/packages/ssr/package.json +2 -2
- package/packages/ssr/src/lib/cron-ssr-save-views.ts +14 -3
- package/packages/storefront/package.json +2 -2
- package/packages/storefront/src/helpers/afetch.ts +22 -5
- package/packages/storefront/src/lib/composables/use-pagination.ts +1 -1
- package/packages/storefront/src/lib/composables/use-shipping-calculator.ts +273 -0
- package/packages/storefront/src/lib/scripts/push-analytics-events.ts +1 -1
- package/packages/storefront/src/lib/state/modules-info.ts +34 -10
- package/packages/test-base/package.json +1 -1
- package/packages/types/index.ts +82 -53
- package/packages/types/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,30 @@
|
|
|
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.3.0](https://github.com/ecomplus/cloud-commerce/compare/v2.2.3...v2.3.0) (2024-02-01)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
* **modules:** Supporting `?skip_ids` param on Modules API POST requests ([200e7da](https://github.com/ecomplus/cloud-commerce/commit/200e7da07744f3fc1f5990cb9ee71432f614f6be))
|
|
11
|
+
* **storefront:** New `useShippingCalculator` composable ([be8b43d](https://github.com/ecomplus/cloud-commerce/commit/be8b43d7ee50771070c6de835d7d034ed7556222))
|
|
12
|
+
* **storefront:** New typed `fetchModule` function exported on `@@sf/state/modules-info` ([e75e45d](https://github.com/ecomplus/cloud-commerce/commit/e75e45db571b94cfa0df3dfa5c9cece412717008))
|
|
13
|
+
* **types:** Add `ModuleApiEndpoint`, `ModuleApiParams` and `ModuleApiResult` to exported types ([104be19](https://github.com/ecomplus/cloud-commerce/commit/104be19e41ec4efb2d2bccf6922be7c86c29c697))
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
### Bug Fixes
|
|
17
|
+
|
|
18
|
+
* **storefront:** Bump Astro to latest v4.2.8 ([ca93a6d](https://github.com/ecomplus/cloud-commerce/commit/ca93a6d63098c4903ead042f5ca0bc0700f8e7c0))
|
|
19
|
+
* **storefront:** Fix watching `isUrlPath` optional prop value change ([1aca5f4](https://github.com/ecomplus/cloud-commerce/commit/1aca5f42963c600873b434d787f86ae269eedec1))
|
|
20
|
+
* **storefront:** Properly handle params to URL query on `afetch` wrapper ([733f608](https://github.com/ecomplus/cloud-commerce/commit/733f6088128f14c51d18d6344f7c5ce2d7e714d3))
|
|
21
|
+
|
|
22
|
+
### [2.2.3](https://github.com/ecomplus/cloud-commerce/compare/v2.2.2...v2.2.3) (2024-01-31)
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
### Bug Fixes
|
|
26
|
+
|
|
27
|
+
* **ssr:** Fixing Firestore query on `ssrPageViews` to purge CDN cache ([9d4f208](https://github.com/ecomplus/cloud-commerce/commit/9d4f208b38ac79ce2fbc2a35e3b8e9162d03d573))
|
|
28
|
+
|
|
5
29
|
### [2.2.2](https://github.com/ecomplus/cloud-commerce/compare/v2.2.1...v2.2.2) (2024-01-31)
|
|
6
30
|
|
|
7
31
|
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
},
|
|
16
16
|
"main": "index.js",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@cloudcommerce/feeds": "^2.2.
|
|
19
|
-
"@cloudcommerce/firebase": "^2.2.
|
|
20
|
-
"@cloudcommerce/passport": "^2.2.
|
|
18
|
+
"@cloudcommerce/feeds": "^2.2.3",
|
|
19
|
+
"@cloudcommerce/firebase": "^2.2.3",
|
|
20
|
+
"@cloudcommerce/passport": "^2.2.3"
|
|
21
21
|
}
|
|
22
22
|
}
|
|
@@ -18,15 +18,15 @@
|
|
|
18
18
|
},
|
|
19
19
|
"main": "index.js",
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@cloudcommerce/api": "^2.2.
|
|
22
|
-
"@cloudcommerce/firebase": "^2.2.
|
|
23
|
-
"@cloudcommerce/ssr": "^2.2.
|
|
21
|
+
"@cloudcommerce/api": "^2.2.3",
|
|
22
|
+
"@cloudcommerce/firebase": "^2.2.3",
|
|
23
|
+
"@cloudcommerce/ssr": "^2.2.3",
|
|
24
24
|
"@headlessui/vue": "^1.7.17"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
|
-
"@cloudcommerce/i18n": "^2.2.
|
|
28
|
-
"@cloudcommerce/storefront": "^2.2.
|
|
29
|
-
"@cloudcommerce/types": "^2.2.
|
|
27
|
+
"@cloudcommerce/i18n": "^2.2.3",
|
|
28
|
+
"@cloudcommerce/storefront": "^2.2.3",
|
|
29
|
+
"@cloudcommerce/types": "^2.2.3",
|
|
30
30
|
"@iconify-json/mingcute": "^1.1.15",
|
|
31
31
|
"photoswipe": "^5.4.3"
|
|
32
32
|
}
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
},
|
|
16
16
|
"main": "index.js",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@cloudcommerce/events": "^2.2.
|
|
19
|
-
"@cloudcommerce/firebase": "^2.2.
|
|
20
|
-
"@cloudcommerce/modules": "^2.2.
|
|
18
|
+
"@cloudcommerce/events": "^2.2.3",
|
|
19
|
+
"@cloudcommerce/firebase": "^2.2.3",
|
|
20
|
+
"@cloudcommerce/modules": "^2.2.3"
|
|
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.2.
|
|
29
|
+
"@cloudcommerce/cli": "^2.2.3"
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
32
|
-
"@cloudcommerce/eslint": "^2.2.
|
|
32
|
+
"@cloudcommerce/eslint": "^2.2.3",
|
|
33
33
|
"husky": "^9.0.7",
|
|
34
34
|
"lint-staged": "^15.2.0"
|
|
35
35
|
}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cloudcommerce",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "2.
|
|
4
|
+
"version": "2.3.0",
|
|
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.2.2",
|
|
38
38
|
"zx": "^7.2.3",
|
|
39
|
-
"@cloudcommerce/eslint": "2.
|
|
39
|
+
"@cloudcommerce/eslint": "2.3.0"
|
|
40
40
|
},
|
|
41
41
|
"scripts": {
|
|
42
42
|
"fix-install": "bash scripts/pre-install.sh && pnpm i",
|
|
@@ -12,7 +12,7 @@ const ajvAppsResponse = addFormats(new Ajv({ ...ajvOptions, allErrors: true }));
|
|
|
12
12
|
// Cache apps list and no params modules results
|
|
13
13
|
const appsCache = {};
|
|
14
14
|
const resultsCache = {};
|
|
15
|
-
async function runModule(params, res, modName, validate, responseValidate, appId) {
|
|
15
|
+
async function runModule(params, res, modName, validate, responseValidate, appId, skipAppIds) {
|
|
16
16
|
const respond = (result) => res.send({
|
|
17
17
|
result,
|
|
18
18
|
meta: params,
|
|
@@ -29,11 +29,7 @@ async function runModule(params, res, modName, validate, responseValidate, appId
|
|
|
29
29
|
[`modules.${modName}.enabled`]: true,
|
|
30
30
|
fields: `_id,app_id,version,data,hidden_data,modules.${modName}`,
|
|
31
31
|
};
|
|
32
|
-
if (appId
|
|
33
|
-
&& (typeof appId === 'number' || (typeof appId === 'string' && /^\d+$/.test(appId)))) {
|
|
34
|
-
if (typeof appId === 'string') {
|
|
35
|
-
appId = parseInt(appId, 10);
|
|
36
|
-
}
|
|
32
|
+
if (appId) {
|
|
37
33
|
canCache = false;
|
|
38
34
|
listAppsParams.app_id = appId;
|
|
39
35
|
listAppsParams.limit = 1;
|
|
@@ -85,6 +81,9 @@ async function runModule(params, res, modName, validate, responseValidate, appId
|
|
|
85
81
|
if (!application.data) {
|
|
86
82
|
application.data = {};
|
|
87
83
|
}
|
|
84
|
+
if (!appId && skipAppIds?.find((id) => id === application.app_id)) {
|
|
85
|
+
continue;
|
|
86
|
+
}
|
|
88
87
|
const appModuleUrl = application.modules[modName].endpoint;
|
|
89
88
|
// Handle request with big timeout if proxying one app (by ID) only
|
|
90
89
|
const isBigTimeout = !!(appId);
|
|
@@ -164,7 +163,29 @@ export default (modName, schema, responseSchema, req, res) => {
|
|
|
164
163
|
runModule(req.query, res, modName, validate, responseValidate);
|
|
165
164
|
},
|
|
166
165
|
POST() {
|
|
167
|
-
|
|
166
|
+
let appId;
|
|
167
|
+
const qAppId = req.query.app_id;
|
|
168
|
+
if (qAppId) {
|
|
169
|
+
if (typeof qAppId === 'string' && /^\d+$/.test(qAppId)) {
|
|
170
|
+
appId = parseInt(qAppId, 10);
|
|
171
|
+
}
|
|
172
|
+
if (typeof qAppId === 'number' && qAppId > 1) {
|
|
173
|
+
appId = qAppId;
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
const skipAppIds = [];
|
|
177
|
+
const qSkipIds = req.query.skip_ids;
|
|
178
|
+
if (qSkipIds) {
|
|
179
|
+
(Array.isArray(qSkipIds) ? qSkipIds : [qSkipIds]).forEach((qSkipId) => {
|
|
180
|
+
if (typeof qSkipId === 'string') {
|
|
181
|
+
qSkipId = parseInt(qSkipId, 10);
|
|
182
|
+
}
|
|
183
|
+
if (typeof qSkipId === 'number' && qSkipId > 1) {
|
|
184
|
+
skipAppIds.push(qSkipId);
|
|
185
|
+
}
|
|
186
|
+
});
|
|
187
|
+
}
|
|
188
|
+
runModule(req.body, res, modName, validate, responseValidate, appId, skipAppIds);
|
|
168
189
|
},
|
|
169
190
|
};
|
|
170
191
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handle-module.js","sourceRoot":"","sources":["../../src/firebase/handle-module.ts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAC/C,OAAO,GAAyB,MAAM,KAAK,CAAC;AAC5C,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,GAAG,MAAM,oBAAoB,CAAC;AACrC,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,EACL,GAAG,EACH,UAAU,EACV,cAAc,EACd,gBAAgB,GACjB,MAAM,OAAO,CAAC;AACf,OAAO,aAAa,MAAM,mBAAmB,CAAC;AAE9C,MAAM,eAAe,GAAG,UAAU,CAAC,IAAI,GAAG,CAAC,EAAE,GAAG,UAAU,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAEhF,gDAAgD;AAChD,MAAM,SAAS,GAAG,EAAE,CAAC;AACrB,MAAM,YAAY,GAAG,EAAE,CAAC;AAExB,KAAK,UAAU,SAAS,CACtB,MAA8B,EAC9B,GAAa,EACb,OAAe,EACf,QAA0B,EAC1B,gBAAkC,EAClC,
|
|
1
|
+
{"version":3,"file":"handle-module.js","sourceRoot":"","sources":["../../src/firebase/handle-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,8 @@ async function runModule(
|
|
|
26
26
|
modName: string,
|
|
27
27
|
validate: ValidateFunction,
|
|
28
28
|
responseValidate: ValidateFunction,
|
|
29
|
-
appId?:
|
|
29
|
+
appId?: number,
|
|
30
|
+
skipAppIds?: number[],
|
|
30
31
|
) {
|
|
31
32
|
const respond = (result: any[]) => res.send({
|
|
32
33
|
result,
|
|
@@ -44,13 +45,7 @@ async function runModule(
|
|
|
44
45
|
[`modules.${modName}.enabled`]: true,
|
|
45
46
|
fields: `_id,app_id,version,data,hidden_data,modules.${modName}`,
|
|
46
47
|
};
|
|
47
|
-
if (
|
|
48
|
-
appId
|
|
49
|
-
&& (typeof appId === 'number' || (typeof appId === 'string' && /^\d+$/.test(appId)))
|
|
50
|
-
) {
|
|
51
|
-
if (typeof appId === 'string') {
|
|
52
|
-
appId = parseInt(appId, 10);
|
|
53
|
-
}
|
|
48
|
+
if (appId) {
|
|
54
49
|
canCache = false;
|
|
55
50
|
listAppsParams.app_id = appId;
|
|
56
51
|
listAppsParams.limit = 1;
|
|
@@ -104,6 +99,9 @@ async function runModule(
|
|
|
104
99
|
if (!application.data) {
|
|
105
100
|
application.data = {};
|
|
106
101
|
}
|
|
102
|
+
if (!appId && skipAppIds?.find((id) => id === application.app_id)) {
|
|
103
|
+
continue;
|
|
104
|
+
}
|
|
107
105
|
const appModuleUrl = application.modules[modName].endpoint as string;
|
|
108
106
|
// Handle request with big timeout if proxying one app (by ID) only
|
|
109
107
|
const isBigTimeout = !!(appId);
|
|
@@ -203,7 +201,37 @@ export default (
|
|
|
203
201
|
runModule(req.query, res, modName, validate, responseValidate);
|
|
204
202
|
},
|
|
205
203
|
POST() {
|
|
206
|
-
|
|
204
|
+
let appId: undefined | number;
|
|
205
|
+
const qAppId = req.query.app_id;
|
|
206
|
+
if (qAppId) {
|
|
207
|
+
if (typeof qAppId === 'string' && /^\d+$/.test(qAppId)) {
|
|
208
|
+
appId = parseInt(qAppId, 10);
|
|
209
|
+
}
|
|
210
|
+
if (typeof qAppId === 'number' && qAppId > 1) {
|
|
211
|
+
appId = qAppId;
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
const skipAppIds: number[] = [];
|
|
215
|
+
const qSkipIds = req.query.skip_ids;
|
|
216
|
+
if (qSkipIds) {
|
|
217
|
+
(Array.isArray(qSkipIds) ? qSkipIds : [qSkipIds]).forEach((qSkipId: any) => {
|
|
218
|
+
if (typeof qSkipId === 'string') {
|
|
219
|
+
qSkipId = parseInt(qSkipId, 10);
|
|
220
|
+
}
|
|
221
|
+
if (typeof qSkipId === 'number' && qSkipId > 1) {
|
|
222
|
+
skipAppIds.push(qSkipId);
|
|
223
|
+
}
|
|
224
|
+
});
|
|
225
|
+
}
|
|
226
|
+
runModule(
|
|
227
|
+
req.body,
|
|
228
|
+
res,
|
|
229
|
+
modName,
|
|
230
|
+
validate,
|
|
231
|
+
responseValidate,
|
|
232
|
+
appId,
|
|
233
|
+
skipAppIds,
|
|
234
|
+
);
|
|
207
235
|
},
|
|
208
236
|
};
|
|
209
237
|
};
|