cloudcommerce 2.10.7 → 2.11.2
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/.github/workflows/test-apps.yml +2 -2
- package/CHANGELOG.md +19 -0
- package/action.yml +2 -2
- package/ecomplus-stores/barradoce/functions/many/package.json +3 -3
- package/ecomplus-stores/barradoce/functions/ssr/content/extra-pages/promocoes.md +1 -1
- package/ecomplus-stores/barradoce/functions/ssr/package.json +6 -6
- package/ecomplus-stores/barradoce/functions/ssr/public/robots.txt +1 -0
- package/ecomplus-stores/barradoce/functions/ssr/src/state/midd-search-engine.ts +9 -1
- package/ecomplus-stores/barradoce/functions/ssr/tsconfig.json +6 -2
- 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/lib/api.d.ts +8 -1
- package/packages/api/lib/api.js +12 -3
- package/packages/api/lib/api.js.map +1 -1
- package/packages/api/package.json +1 -1
- package/packages/api/src/api.ts +20 -5
- 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/serve-storefront.js +3 -1
- package/packages/ssr/lib/lib/serve-storefront.js.map +1 -1
- package/packages/ssr/package.json +2 -2
- package/packages/ssr/src/lib/serve-storefront.ts +3 -1
- package/packages/storefront/dist/client/_astro/ProductDetails.BpZtnS8j.js +1 -7
- package/packages/storefront/dist/client/_astro/hoisted.-C0vLMXT.js +8 -0
- package/packages/storefront/dist/server/_astro-internal_middleware.mjs +2 -2
- package/packages/storefront/dist/server/chunks/{404_jTV5wvby.mjs → 404_BcY_5eJJ.mjs} +1 -1
- package/packages/storefront/dist/server/chunks/{CartSidebar_CV9qwGNE.mjs → CartSidebar_tmly-0ip.mjs} +2 -2
- package/packages/storefront/dist/server/chunks/{SearchModal_Cw1ECnXI.mjs → SearchModal_CGNQss2j.mjs} +2 -2
- package/packages/storefront/dist/server/chunks/{_.._k1NruPDv.mjs → _.._Bt6Uzpk2.mjs} +1 -1
- package/packages/storefront/dist/server/chunks/{_astro-internal_middleware_DIG56BhA.mjs → _astro-internal_middleware_CqUpziyW.mjs} +1 -1
- package/packages/storefront/dist/server/chunks/{_page__BKNX3RH7.mjs → _page__Dz-iZHMh.mjs} +1 -1
- package/packages/storefront/dist/server/chunks/{account_BZOa6Kmc.mjs → account_tfs9KFTy.mjs} +1 -1
- package/packages/storefront/dist/server/chunks/astro/{assets-service_MW85B416.mjs → assets-service_DSoC_W52.mjs} +2 -1
- package/packages/storefront/dist/server/chunks/{astro_8KdHu_Gf.mjs → astro_Cu3MZ9xv.mjs} +72 -33
- package/packages/storefront/dist/server/chunks/{index_D1o9pXka.mjs → index_BKS_40rA.mjs} +1 -1
- package/packages/storefront/dist/server/chunks/{index_CZ6FSUEb.mjs → index_CGzMgZTN.mjs} +1 -1
- package/packages/storefront/dist/server/chunks/{node_Khrf-0bH.mjs → node_lZaNT3E1.mjs} +1 -1
- package/packages/storefront/dist/server/chunks/pages/{404_BPSxJtl3.mjs → 404_CMwuVMu1.mjs} +9 -10
- package/packages/storefront/dist/server/chunks/pages/{__ByRpsTnC.mjs → __Dz53F-0T.mjs} +2 -2
- package/packages/storefront/dist/server/chunks/pages/{_page__BasreLue.mjs → _page__C1x19nYF.mjs} +3 -3
- package/packages/storefront/dist/server/chunks/pages/{account_MZBvNAyZ.mjs → account_B5Z6wDBy.mjs} +2 -2
- package/packages/storefront/dist/server/chunks/pages/{index_CV2ET14h.mjs → index_CqvjdvSg.mjs} +3 -3
- package/packages/storefront/dist/server/chunks/pages/{node_1tKTIKG-.mjs → node_mvX6Tssv.mjs} +4 -111
- package/packages/storefront/dist/server/chunks/pages/{~fallback_BVYzgZ5p.mjs → ~fallback_D2ugBVgc.mjs} +2 -2
- package/packages/storefront/dist/server/chunks/{~fallback_xH9bJF7E.mjs → ~fallback_CrFe__-f.mjs} +1 -1
- package/packages/storefront/dist/server/entry.mjs +15 -14
- package/packages/storefront/dist/server/{manifest_S9lE9v48.mjs → manifest_D4v8KX-D.mjs} +2 -2
- package/packages/storefront/dist/server/middleware.mjs +2 -2
- package/packages/storefront/dist/server/renderers.mjs +1 -1
- package/packages/storefront/package.json +3 -3
- package/packages/storefront/server.d.ts +2 -4
- package/packages/storefront/src/lib/$storefront.d.ts +4 -0
- package/packages/storefront/src/lib/ssr-context.ts +3 -3
- package/packages/storefront/tsconfig.base.json +16 -0
- package/packages/storefront/tsconfig.json +5 -13
- package/packages/test-base/package.json +1 -1
- package/packages/types/package.json +1 -1
- package/packages/storefront/dist/client/_astro/hoisted.CSjieYcR.js +0 -8
|
@@ -104,11 +104,11 @@ jobs:
|
|
|
104
104
|
${{ steps.npm-paths.outputs.LIB_PATH }}
|
|
105
105
|
${{ steps.npm-paths.outputs.BIN_PATH }}
|
|
106
106
|
~/.npm-global/bin
|
|
107
|
-
key: ${{ runner.os }}-npm-globals-firebase-tools-13.
|
|
107
|
+
key: ${{ runner.os }}-npm-globals-firebase-tools-13.7.0
|
|
108
108
|
|
|
109
109
|
- if: steps.npm-g-cache.outputs.cache-hit != 'true'
|
|
110
110
|
shell: bash
|
|
111
|
-
run: npm install -g firebase-tools@13.
|
|
111
|
+
run: npm install -g firebase-tools@13.7.0
|
|
112
112
|
|
|
113
113
|
- name: Initialize Firebase emulators
|
|
114
114
|
shell: bash
|
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,25 @@
|
|
|
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.11.2](https://github.com/ecomplus/cloud-commerce/compare/v2.11.1...v2.11.2) (2024-04-05)
|
|
6
|
+
|
|
7
|
+
### [2.11.1](https://github.com/ecomplus/cloud-commerce/compare/v2.11.0...v2.11.1) (2024-04-05)
|
|
8
|
+
|
|
9
|
+
## [2.11.0](https://github.com/ecomplus/cloud-commerce/compare/v2.10.7...v2.11.0) (2024-04-05)
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
### Features
|
|
13
|
+
|
|
14
|
+
* **api:** Improving `ApiError` for debug with `url` property (string) ([d8cfaee](https://github.com/ecomplus/cloud-commerce/commit/d8cfaee339bf6dd552edabec8788307914f8cc4b))
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### Bug Fixes
|
|
18
|
+
|
|
19
|
+
* **storefront:** Bump Astro to latest v4.5.16 ([8f52440](https://github.com/ecomplus/cloud-commerce/commit/8f5244025dd653a5680b8313a4f5b2ee1b07a23c))
|
|
20
|
+
* **storefront:** Ensure `global.$storefront` typedef is properly set ([cdf92d6](https://github.com/ecomplus/cloud-commerce/commit/cdf92d6acee551ab44e954086fae926aaaa59f4e))
|
|
21
|
+
* **storefront:** New `tsconfig.base.json` file to deal with include/exclude when usign extends ([55fd330](https://github.com/ecomplus/cloud-commerce/commit/55fd3308a1ad5b9e89e15a9cb46b10ff0867a027))
|
|
22
|
+
* **storefront:** Revert Astro to 4.5.10 ([7d3d05d](https://github.com/ecomplus/cloud-commerce/commit/7d3d05d4c16d5fa5479baf501eaccfdc7359ac79))
|
|
23
|
+
|
|
5
24
|
### [2.10.7](https://github.com/ecomplus/cloud-commerce/compare/v2.10.6...v2.10.7) (2024-04-04)
|
|
6
25
|
|
|
7
26
|
|
package/action.yml
CHANGED
|
@@ -138,11 +138,11 @@ runs:
|
|
|
138
138
|
${{ steps.npm-paths.outputs.LIB_PATH }}
|
|
139
139
|
${{ steps.npm-paths.outputs.BIN_PATH }}
|
|
140
140
|
~/.npm-global/bin
|
|
141
|
-
key: ${{ runner.os }}-npm-g-firebase-tools-13.
|
|
141
|
+
key: ${{ runner.os }}-npm-g-firebase-tools-13.7.0
|
|
142
142
|
|
|
143
143
|
- if: github.event_name == 'push' && steps.npm-g-cache.outputs.cache-hit != 'true'
|
|
144
144
|
shell: bash
|
|
145
|
-
run: npm i --location=global firebase-tools@13.
|
|
145
|
+
run: npm i --location=global firebase-tools@13.7.0
|
|
146
146
|
|
|
147
147
|
- if: github.event_name == 'push'
|
|
148
148
|
uses: dorny/paths-filter@v3.0.2
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
},
|
|
16
16
|
"main": "index.js",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@cloudcommerce/feeds": "^2.10.
|
|
19
|
-
"@cloudcommerce/firebase": "^2.10.
|
|
20
|
-
"@cloudcommerce/passport": "^2.10.
|
|
18
|
+
"@cloudcommerce/feeds": "^2.10.7",
|
|
19
|
+
"@cloudcommerce/firebase": "^2.10.7",
|
|
20
|
+
"@cloudcommerce/passport": "^2.10.7"
|
|
21
21
|
}
|
|
22
22
|
}
|
|
@@ -19,16 +19,16 @@
|
|
|
19
19
|
},
|
|
20
20
|
"main": "index.js",
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@cloudcommerce/api": "^2.10.
|
|
23
|
-
"@cloudcommerce/firebase": "^2.10.
|
|
24
|
-
"@cloudcommerce/ssr": "^2.10.
|
|
22
|
+
"@cloudcommerce/api": "^2.10.7",
|
|
23
|
+
"@cloudcommerce/firebase": "^2.10.7",
|
|
24
|
+
"@cloudcommerce/ssr": "^2.10.7",
|
|
25
25
|
"@headlessui/vue": "^1.7.18",
|
|
26
26
|
"micromark": "^4.0.0"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
|
-
"@cloudcommerce/i18n": "^2.10.
|
|
30
|
-
"@cloudcommerce/storefront": "^2.10.
|
|
31
|
-
"@cloudcommerce/types": "^2.10.
|
|
29
|
+
"@cloudcommerce/i18n": "^2.10.7",
|
|
30
|
+
"@cloudcommerce/storefront": "^2.10.7",
|
|
31
|
+
"@cloudcommerce/types": "^2.10.7",
|
|
32
32
|
"@iconify-json/mingcute": "^1.1.16",
|
|
33
33
|
"photoswipe": "^5.4.3"
|
|
34
34
|
}
|
|
@@ -2,7 +2,15 @@ import type { SearchEngineInstance } from '@@sf/state/search-engine';
|
|
|
2
2
|
|
|
3
3
|
export default (searchEngine: SearchEngineInstance) => {
|
|
4
4
|
searchEngine.addMiddleware((searchOptions) => {
|
|
5
|
-
|
|
5
|
+
const { apiContext } = globalThis.$storefront;
|
|
6
|
+
switch (apiContext?.resource) {
|
|
7
|
+
case 'categories':
|
|
8
|
+
case 'brands':
|
|
9
|
+
case 'collections':
|
|
10
|
+
if (!searchOptions.params?.sort) return;
|
|
11
|
+
break;
|
|
12
|
+
default:
|
|
13
|
+
}
|
|
6
14
|
if (!searchOptions.params) searchOptions.params = {};
|
|
7
15
|
let { sort } = searchOptions.params;
|
|
8
16
|
if (
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
{
|
|
2
|
-
"extends": "@cloudcommerce/storefront/tsconfig.json",
|
|
2
|
+
"extends": "@cloudcommerce/storefront/tsconfig.base.json",
|
|
3
|
+
"include": [
|
|
4
|
+
"src",
|
|
5
|
+
"content",
|
|
6
|
+
],
|
|
3
7
|
"compilerOptions": {
|
|
4
8
|
"baseUrl": ".",
|
|
5
9
|
"paths": {
|
|
@@ -8,5 +12,5 @@
|
|
|
8
12
|
"~/*": ["./src/*"],
|
|
9
13
|
"content/*": ["./content/*"],
|
|
10
14
|
}
|
|
11
|
-
}
|
|
15
|
+
},
|
|
12
16
|
}
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
},
|
|
16
16
|
"main": "index.js",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@cloudcommerce/events": "^2.10.
|
|
19
|
-
"@cloudcommerce/firebase": "^2.10.
|
|
20
|
-
"@cloudcommerce/modules": "^2.10.
|
|
18
|
+
"@cloudcommerce/events": "^2.10.7",
|
|
19
|
+
"@cloudcommerce/firebase": "^2.10.7",
|
|
20
|
+
"@cloudcommerce/modules": "^2.10.7"
|
|
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.10.
|
|
29
|
+
"@cloudcommerce/cli": "^2.10.7"
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
32
|
-
"@cloudcommerce/eslint": "^2.10.
|
|
32
|
+
"@cloudcommerce/eslint": "^2.10.7",
|
|
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.
|
|
4
|
+
"version": "2.11.2",
|
|
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.2.7",
|
|
37
37
|
"vitest": "^1.4.0",
|
|
38
38
|
"zx": "^7.2.3",
|
|
39
|
-
"@cloudcommerce/eslint": "2.
|
|
39
|
+
"@cloudcommerce/eslint": "2.11.2"
|
|
40
40
|
},
|
|
41
41
|
"scripts": {
|
|
42
42
|
"fix-install": "bash scripts/pre-install.sh && pnpm i",
|
|
@@ -10,13 +10,20 @@ declare global {
|
|
|
10
10
|
}
|
|
11
11
|
declare class ApiError extends Error {
|
|
12
12
|
config: Config;
|
|
13
|
+
url?: string;
|
|
13
14
|
response?: Response & {
|
|
14
15
|
data?: ErrorBody;
|
|
15
16
|
};
|
|
16
17
|
statusCode?: number;
|
|
17
18
|
data?: ErrorBody;
|
|
18
19
|
isTimeout: boolean;
|
|
19
|
-
constructor(config
|
|
20
|
+
constructor({ config, url, response, msg, isTimeout, }: {
|
|
21
|
+
config: Config;
|
|
22
|
+
url?: string;
|
|
23
|
+
response?: ApiError['response'];
|
|
24
|
+
msg?: string;
|
|
25
|
+
isTimeout?: boolean;
|
|
26
|
+
});
|
|
20
27
|
}
|
|
21
28
|
declare const def: {
|
|
22
29
|
middleware(config: Config): {
|
package/packages/api/lib/api.js
CHANGED
|
@@ -4,7 +4,9 @@ if (!globalThis.__apiCache) {
|
|
|
4
4
|
const _env = ((typeof process === 'object' && process?.env)
|
|
5
5
|
|| globalThis);
|
|
6
6
|
class ApiError extends Error {
|
|
7
|
-
constructor(
|
|
7
|
+
constructor({
|
|
8
|
+
config, url, response, msg, isTimeout = false,
|
|
9
|
+
}) {
|
|
8
10
|
if (response) {
|
|
9
11
|
super(response.statusText);
|
|
10
12
|
this.data = response.data;
|
|
@@ -12,6 +14,7 @@ class ApiError extends Error {
|
|
|
12
14
|
} else {
|
|
13
15
|
super(msg || 'Request error');
|
|
14
16
|
}
|
|
17
|
+
this.url = url;
|
|
15
18
|
this.config = config;
|
|
16
19
|
this.response = response;
|
|
17
20
|
this.isTimeout = isTimeout;
|
|
@@ -134,7 +137,13 @@ const api = async (requestConfig, _retries = 0) => {
|
|
|
134
137
|
if (err.cause) {
|
|
135
138
|
msg += ` - ${err.cause}`;
|
|
136
139
|
}
|
|
137
|
-
throw new ApiError(
|
|
140
|
+
throw new ApiError({
|
|
141
|
+
config,
|
|
142
|
+
url,
|
|
143
|
+
response,
|
|
144
|
+
msg,
|
|
145
|
+
isTimeout,
|
|
146
|
+
});
|
|
138
147
|
}
|
|
139
148
|
clearTimeout(timer);
|
|
140
149
|
if (response) {
|
|
@@ -165,7 +174,7 @@ const api = async (requestConfig, _retries = 0) => {
|
|
|
165
174
|
} catch (e) {
|
|
166
175
|
//
|
|
167
176
|
}
|
|
168
|
-
throw new ApiError(config, response);
|
|
177
|
+
throw new ApiError({ config, url, response });
|
|
169
178
|
};
|
|
170
179
|
const get = (endpoint, config) => {
|
|
171
180
|
// @ts-ignore
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAoBA,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;IAC3B,UAAU,CAAC,UAAU,GAAG,EAAE,CAAC;AAC7B,CAAC;AAED,MAAM,IAAI,GAAG,CACX,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,EAAE,GAAG,CAAC;OAC1C,UAAU,CACS,CAAC;AAEzB,MAAM,QAAS,SAAQ,KAAK;
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"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"}
|
package/packages/api/src/api.ts
CHANGED
|
@@ -29,16 +29,24 @@ const _env = (
|
|
|
29
29
|
|
|
30
30
|
class ApiError extends Error {
|
|
31
31
|
config: Config;
|
|
32
|
+
url?: string;
|
|
32
33
|
response?: Response & { data?: ErrorBody };
|
|
33
34
|
statusCode?: number;
|
|
34
35
|
data?: ErrorBody;
|
|
35
36
|
isTimeout: boolean;
|
|
36
|
-
constructor(
|
|
37
|
+
constructor({
|
|
38
|
+
config,
|
|
39
|
+
url,
|
|
40
|
+
response,
|
|
41
|
+
msg,
|
|
42
|
+
isTimeout = false,
|
|
43
|
+
}: {
|
|
37
44
|
config: Config,
|
|
45
|
+
url?: string,
|
|
38
46
|
response?: ApiError['response'],
|
|
39
47
|
msg?: string,
|
|
40
|
-
isTimeout
|
|
41
|
-
) {
|
|
48
|
+
isTimeout?: boolean,
|
|
49
|
+
}) {
|
|
42
50
|
if (response) {
|
|
43
51
|
super(response.statusText);
|
|
44
52
|
this.data = response.data;
|
|
@@ -46,6 +54,7 @@ class ApiError extends Error {
|
|
|
46
54
|
} else {
|
|
47
55
|
super(msg || 'Request error');
|
|
48
56
|
}
|
|
57
|
+
this.url = url;
|
|
49
58
|
this.config = config;
|
|
50
59
|
this.response = response;
|
|
51
60
|
this.isTimeout = isTimeout;
|
|
@@ -184,7 +193,13 @@ const api = async <T extends Config & { body?: any, data?: any }>(
|
|
|
184
193
|
if (err.cause) {
|
|
185
194
|
msg += ` - ${err.cause}`;
|
|
186
195
|
}
|
|
187
|
-
throw new ApiError(
|
|
196
|
+
throw new ApiError({
|
|
197
|
+
config,
|
|
198
|
+
url,
|
|
199
|
+
response,
|
|
200
|
+
msg,
|
|
201
|
+
isTimeout,
|
|
202
|
+
});
|
|
188
203
|
}
|
|
189
204
|
clearTimeout(timer);
|
|
190
205
|
|
|
@@ -216,7 +231,7 @@ const api = async <T extends Config & { body?: any, data?: any }>(
|
|
|
216
231
|
} catch (e) {
|
|
217
232
|
//
|
|
218
233
|
}
|
|
219
|
-
throw new ApiError(config, response);
|
|
234
|
+
throw new ApiError({ config, url, response });
|
|
220
235
|
};
|
|
221
236
|
|
|
222
237
|
type AbstractedConfig = Omit<Config, 'endpoint' | 'method'>;
|