cloudcommerce 0.4.1 → 0.6.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/.github/renovate.json +1 -1
- package/CHANGELOG.md +52 -0
- package/action.yml +1 -2
- package/package.json +7 -7
- package/packages/api/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/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/infinitepay/package.json +1 -1
- package/packages/apps/jadlog/package.json +1 -1
- package/packages/apps/loyalty-points/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 +2 -2
- 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 +3 -3
- package/packages/cli/package.json +1 -1
- package/packages/config/package.json +1 -1
- package/packages/emails/package.json +1 -1
- package/packages/events/package.json +1 -1
- package/packages/firebase/package.json +1 -1
- package/packages/i18n/package.json +1 -1
- package/packages/modules/lib/firebase/checkout.js +4 -1
- package/packages/modules/lib/firebase/checkout.js.map +1 -1
- package/packages/modules/package.json +1 -1
- package/packages/modules/src/firebase/checkout.ts +4 -1
- package/packages/passport/package.json +1 -1
- package/packages/ssr/package.json +3 -3
- package/packages/storefront/client.d.ts +23 -3
- package/packages/storefront/config/storefront.cms.cjs +31 -5
- package/packages/storefront/config/storefront.cms.mjs +31 -5
- package/packages/storefront/dist/client/_astro/PitchBar.457658a3.js +1 -0
- package/packages/storefront/dist/client/_astro/Prices.a1302bf9.js +1 -0
- package/packages/storefront/dist/client/_astro/ProductCard.1a45764a.js +1 -0
- package/packages/storefront/dist/client/_astro/ShopHeader.0a6766ac.js +1 -0
- package/packages/storefront/dist/client/_astro/_...slug_.6721f699.css +1 -0
- package/packages/storefront/dist/client/_astro/_plugin-vue_export-helper.6da04e63.js +1 -0
- package/packages/storefront/dist/client/_astro/client.b854166f.js +1 -0
- package/packages/storefront/dist/client/_astro/firebase-app.7ce2ebb1.js +1426 -0
- package/packages/storefront/dist/client/_astro/format-money.6f464cee.js +1 -0
- package/packages/storefront/dist/client/_astro/hoisted.721ad75d.js +1 -0
- package/packages/storefront/dist/client/_astro/idle-callback.889bf0ea.js +1 -0
- package/packages/storefront/dist/client/_astro/index.a500792d.js +1 -0
- package/packages/storefront/dist/client/_astro/modules-info.80ae4e30.js +1 -0
- package/packages/storefront/dist/client/_astro/preload-helper.101896b7.js +1 -0
- package/packages/storefront/dist/client/_astro/runtime-dom.esm-bundler.acde10ec.js +1 -0
- package/packages/storefront/dist/client/fallback/index.html +8 -8
- package/packages/storefront/dist/client/sw.js +1 -1
- package/packages/storefront/dist/server/chunks/{astro.0f5b754a.mjs → astro.7d9d5f6e.mjs} +100 -38
- package/packages/storefront/dist/server/chunks/pages/{all.671e6bc1.mjs → all.e0f284c9.mjs} +980 -660
- package/packages/storefront/dist/server/chunks/{prerender.fd8cdc24.mjs → prerender.9f6cbb00.mjs} +0 -0
- package/packages/storefront/dist/server/entry.mjs +100 -48
- package/packages/storefront/package.json +8 -8
- package/packages/storefront/server.d.ts +34 -0
- package/packages/storefront/src/env.d.ts +1 -0
- package/packages/storefront/src/helpers/afetch.ts +3 -1
- package/packages/storefront/src/helpers/idle-callback.ts +9 -0
- package/packages/storefront/src/lib/assets/base.css +6 -0
- package/packages/storefront/src/lib/browser-env.ts +22 -0
- package/packages/storefront/src/lib/cms.d.ts +25 -0
- package/packages/storefront/src/lib/components/Drawer.vue +1 -1
- package/packages/storefront/src/lib/components/LoginForm.vue +13 -9
- package/packages/storefront/src/lib/components/SocialNetworkIcon.vue +29 -0
- package/packages/storefront/src/lib/components/SocialNetworkLink.vue +37 -0
- package/packages/storefront/src/lib/components/globals/ALink.vue +2 -2
- package/packages/storefront/src/lib/composables/use-shop-header.ts +79 -0
- package/packages/storefront/src/lib/layouts/Base.astro +4 -5
- package/packages/storefront/src/lib/layouts/BaseHead.astro +7 -7
- package/packages/storefront/src/lib/layouts/BaseStateJson.astro +1 -1
- package/packages/storefront/src/lib/layouts/PagesHeader.astro +5 -23
- package/packages/storefront/src/lib/scripts/firebase-app.ts +16 -3
- package/packages/storefront/src/lib/server-data.ts +25 -0
- package/packages/storefront/src/lib/ssr-context.ts +11 -10
- package/packages/storefront/src/lib/state/customer-session.ts +51 -30
- package/packages/storefront/src/lib/state/modules-info.ts +3 -6
- package/packages/storefront/tailwind.config.cjs +1 -4
- package/packages/types/index.ts +7 -0
- package/packages/types/package.json +1 -1
- package/pnpm-workspace.yaml +3 -3
- package/packages/storefront/dist/client/_astro/PitchBar.004b6ea4.js +0 -1
- package/packages/storefront/dist/client/_astro/Prices.f311909a.js +0 -1
- package/packages/storefront/dist/client/_astro/Prices.vue_vue_type_script_setup_true_lang.ef47de70.js +0 -1
- package/packages/storefront/dist/client/_astro/ProductCard.34de5097.js +0 -1
- package/packages/storefront/dist/client/_astro/ShopHeader.cbfee289.js +0 -1
- package/packages/storefront/dist/client/_astro/_...slug_.bcc33d9d.css +0 -1
- package/packages/storefront/dist/client/_astro/client.56d86c9b.js +0 -1
- package/packages/storefront/dist/client/_astro/ecom-utils.92f137f6.js +0 -1
- package/packages/storefront/dist/client/_astro/hoisted.6edd7364.js +0 -1
- package/packages/storefront/dist/client/_astro/index.2d12be6c.js +0 -1
- package/packages/storefront/dist/client/_astro/modules-info.0debb0b0.js +0 -1
- package/packages/storefront/dist/client/_astro/runtime-core.esm-bundler.a0432a8e.js +0 -1
- package/packages/storefront/dist/client/_astro/runtime-dom.esm-bundler.0e5774ce.js +0 -1
- package/packages/storefront/src/lib/components/ADrawer.vue +0 -110
- package/packages/storefront/src/lib/components/LoginDrawer.vue +0 -82
- package/packages/storefront/src/lib/components/ShopHeader.vue +0 -111
- package/packages/storefront/src/lib/components/ShopSidenav.vue +0 -26
- package/packages/storefront/src/lib/types/cms-code.d.ts +0 -5
- package/packages/storefront/src/lib/types/cms-contacts.d.ts +0 -5
- package/packages/storefront/src/lib/types/cms-header.d.ts +0 -5
- package/packages/storefront/src/lib/types/cms-settings.d.ts +0 -8
- package/packages/storefront/src/lib/types/cms-social.d.ts +0 -5
package/.github/renovate.json
CHANGED
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,58 @@
|
|
|
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
|
+
## [0.6.0](https://github.com/ecomplus/cloud-commerce/compare/v0.5.0...v0.6.0) (2023-02-19)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### ⚠ BREAKING CHANGES
|
|
9
|
+
|
|
10
|
+
* **storefront:** `ADrawer` and `LoginDrawer` components no more exists
|
|
11
|
+
* **storefront:** Importing `@@sf/state/customer-session` does not start Firebase Auth automatically anymore, must call `initializeFirebaseAuth`
|
|
12
|
+
|
|
13
|
+
### Features
|
|
14
|
+
|
|
15
|
+
* **storefront:** Add `@@sf/browser-env` to exporting booleans for navigator and screen detection ([1281ad5](https://github.com/ecomplus/cloud-commerce/commit/1281ad50b6d23e7336dde1d5e5d4519ddeddcfa7))
|
|
16
|
+
* **storefront:** Add `@@sf/server-data` exporting `settings` and `apiContext` SSRred objects ([40ac1db](https://github.com/ecomplus/cloud-commerce/commit/40ac1db1a30ceb818a019ef21606c7541ceb229c))
|
|
17
|
+
* **storefront:** Also set `globalThis.storefront.context` on SSR context ([2c2fe64](https://github.com/ecomplus/cloud-commerce/commit/2c2fe642a1c07f32a5ee9851cf9c9dfde77e854a))
|
|
18
|
+
* **storefront:** New `SocialNetworkIcon` and `SocialNetworkLink` components ([9702da6](https://github.com/ecomplus/cloud-commerce/commit/9702da68bac461a085c58de143ddf1b5d0c120c7))
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
### Bug Fixes
|
|
22
|
+
|
|
23
|
+
* **storefront:** Auto set customer session email from Firebase if empty, even if not verified ([f1741a9](https://github.com/ecomplus/cloud-commerce/commit/f1741a9696b1bfa3f253aa05404a5c57f5387c7c))
|
|
24
|
+
* **storefront:** Fix `ALink` global component to target _blank on external host ([dffe5d8](https://github.com/ecomplus/cloud-commerce/commit/dffe5d81c6b7261aab3c4bda22b94e337f65e013))
|
|
25
|
+
* **storefront:** Fixing default context API doc minifier regex ([711413f](https://github.com/ecomplus/cloud-commerce/commit/711413f993a087395078aca723483e3ffa4e5aae))
|
|
26
|
+
* **storefront:** Make customer session state SSR friendly ([7dd8dff](https://github.com/ecomplus/cloud-commerce/commit/7dd8dff3680a112f9e9afd348b3a8696466056ff))
|
|
27
|
+
* **storefront:** Update customer session state `isLogged` with email verified only ([d5ada3a](https://github.com/ecomplus/cloud-commerce/commit/d5ada3a130b7082d328611071178d4b92e4721cc))
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
* **storefront:** Removing not intended to use `ADrawer` (=> `Drawer`) and `LoginDrawer` components ([0254f4c](https://github.com/ecomplus/cloud-commerce/commit/0254f4c82a76048b71e29bdcfeffa37b6992793d))
|
|
31
|
+
|
|
32
|
+
## [0.5.0](https://github.com/ecomplus/cloud-commerce/compare/v0.4.1...v0.5.0) (2023-02-16)
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
### ⚠ BREAKING CHANGES
|
|
36
|
+
|
|
37
|
+
* **storefront:** `cms` function is no more always sync
|
|
38
|
+
|
|
39
|
+
### Features
|
|
40
|
+
|
|
41
|
+
* **storefront:** Return `categoryTrees` and getters on `useShopHeader` ([b19cc85](https://github.com/ecomplus/cloud-commerce/commit/b19cc85c7b82c26ea09da17035830abd01331101))
|
|
42
|
+
* **storefront:** Starting new `useShopHeader` composable ([5b83e21](https://github.com/ecomplus/cloud-commerce/commit/5b83e21f9a0a2b2c1d540c46bc9e50bbd93f2bbd))
|
|
43
|
+
* **storefront:** Update `cms()` to return promise excepting to settings ([a4e011a](https://github.com/ecomplus/cloud-commerce/commit/a4e011aa649f591929181f442f1851a141057b67))
|
|
44
|
+
* **types:** Add social network links and Whatsapp number to `CmsSettings` (optionals) ([eeb7fb2](https://github.com/ecomplus/cloud-commerce/commit/eeb7fb2ee11a4f487e74fc6949f89344a43b43f9))
|
|
45
|
+
|
|
46
|
+
|
|
47
|
+
### Bug Fixes
|
|
48
|
+
|
|
49
|
+
* **deps:** Update all non-major dependencies ([#123](https://github.com/ecomplus/cloud-commerce/issues/123)) ([cb11bc0](https://github.com/ecomplus/cloud-commerce/commit/cb11bc0f6b336f06351252c6294d1ffe1a5c547b))
|
|
50
|
+
* **modules:** Limit `client_user_agent` from header to 355 chars ([9992da0](https://github.com/ecomplus/cloud-commerce/commit/9992da0fdd2d7ca4cdb89873f90fffa8f528dd86))
|
|
51
|
+
* **storefront:** Fix `Drawer` relative container height ([e939f91](https://github.com/ecomplus/cloud-commerce/commit/e939f91f4ad52b8e7e54614402b62dea91dd2878))
|
|
52
|
+
* **storefront:** Fix CMS result typedefs ([c56f09f](https://github.com/ecomplus/cloud-commerce/commit/c56f09fd3278813da9ef3a75f17aff03ba85b15e))
|
|
53
|
+
* **storefront:** Making content files optional excepting settings ([96ce212](https://github.com/ecomplus/cloud-commerce/commit/96ce212d0871363a7b1a196a000bc3160987a9fc))
|
|
54
|
+
* **storefront:** Prevent error throw on CMS collection list if dir not exists ([179e20d](https://github.com/ecomplus/cloud-commerce/commit/179e20dcaf8f64112ea92dbd12fbcba74f5a7c90))
|
|
55
|
+
* **storefront:** Update `PagesHeader` layout to import store src `ShopHeader` component ([6322160](https://github.com/ecomplus/cloud-commerce/commit/63221600b7ab25e7dd5f9f8d01d0a3bb32503c5a))
|
|
56
|
+
|
|
5
57
|
### [0.4.1](https://github.com/ecomplus/cloud-commerce/compare/v0.4.0...v0.4.1) (2023-02-09)
|
|
6
58
|
|
|
7
59
|
|
package/action.yml
CHANGED
|
@@ -48,7 +48,7 @@ runs:
|
|
|
48
48
|
steps:
|
|
49
49
|
- uses: actions/setup-node@v3
|
|
50
50
|
with:
|
|
51
|
-
node-version:
|
|
51
|
+
node-version: 18
|
|
52
52
|
cache: 'npm'
|
|
53
53
|
cache-dependency-path: '**/package-lock.json'
|
|
54
54
|
|
|
@@ -92,7 +92,6 @@ runs:
|
|
|
92
92
|
GALAXPAY_PARTNER_ID: ${{ inputs.galaxpay-partner-id }}
|
|
93
93
|
GALAXPAY_PARTNER_HASH: ${{ inputs.galaxpay-partner-hash }}
|
|
94
94
|
DATAFRETE_OPERATOR_TOKEN: ${{ inputs.datafrete-operator-token }}
|
|
95
|
-
|
|
96
95
|
run: |
|
|
97
96
|
export GAC_FILENAME=".gac-$RANDOM.json"
|
|
98
97
|
echo $FIREBASE_SERVICE_ACCOUNT > $GAC_FILENAME
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cloudcommerce",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.6.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>",
|
|
@@ -19,18 +19,18 @@
|
|
|
19
19
|
"@commitlint/cli": "^17.4.2",
|
|
20
20
|
"@commitlint/config-conventional": "^17.4.2",
|
|
21
21
|
"@commitlint/rules": "^17.4.2",
|
|
22
|
-
"@types/node": "^18.
|
|
23
|
-
"@typescript-eslint/eslint-plugin": "^5.
|
|
24
|
-
"@typescript-eslint/parser": "^5.
|
|
25
|
-
"esbuild": "^0.17.
|
|
26
|
-
"eslint": "^8.
|
|
22
|
+
"@types/node": "^18.13.0",
|
|
23
|
+
"@typescript-eslint/eslint-plugin": "^5.51.0",
|
|
24
|
+
"@typescript-eslint/parser": "^5.51.0",
|
|
25
|
+
"esbuild": "^0.17.8",
|
|
26
|
+
"eslint": "^8.34.0",
|
|
27
27
|
"eslint-config-airbnb-base": "^15.0.0",
|
|
28
28
|
"eslint-plugin-import": "^2.27.5",
|
|
29
29
|
"eslint-plugin-vue": "^9.9.0",
|
|
30
30
|
"husky": "^8.0.3",
|
|
31
31
|
"standard-version": "^9.5.0",
|
|
32
32
|
"ts-node": "^10.9.1",
|
|
33
|
-
"turbo": "1.6.
|
|
33
|
+
"turbo": "1.6.3",
|
|
34
34
|
"typescript": "^4.9.5",
|
|
35
35
|
"uglify-js": "^3.17.4",
|
|
36
36
|
"vite": "^4.1.1",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudcommerce/app-pagarme",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.6.0",
|
|
5
5
|
"description": "E-Com Plus Cloud Commerce app to integrate Pagar.me",
|
|
6
6
|
"main": "lib/pagarme.js",
|
|
7
7
|
"exports": {
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
"axios": "^1.3.2",
|
|
29
29
|
"firebase-admin": "^11.5.0",
|
|
30
30
|
"firebase-functions": "^4.2.1",
|
|
31
|
-
"pagarme": "^4.
|
|
31
|
+
"pagarme": "^4.30.0",
|
|
32
32
|
"qs": "^6.11.0"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudcommerce/app-webhooks",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.6.0",
|
|
5
5
|
"description": "E-Com Plus Cloud Commerce app for general order webhooks",
|
|
6
6
|
"main": "lib/index.js",
|
|
7
7
|
"repository": {
|
|
@@ -21,9 +21,9 @@
|
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@cloudcommerce/api": "workspace:*",
|
|
23
23
|
"@cloudcommerce/firebase": "workspace:*",
|
|
24
|
-
"axios": "^1.2
|
|
24
|
+
"axios": "^1.3.2",
|
|
25
25
|
"firebase-admin": "^11.5.0",
|
|
26
|
-
"firebase-functions": "^4.2.
|
|
26
|
+
"firebase-functions": "^4.2.1"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"@cloudcommerce/types": "workspace:*",
|
|
@@ -18,7 +18,10 @@ export default async (req, res) => {
|
|
|
18
18
|
const validate = ajv.compile(checkoutSchema.params);
|
|
19
19
|
const checkoutBody = req.body;
|
|
20
20
|
req.body.client_ip = req.ip;
|
|
21
|
-
|
|
21
|
+
const userAgent = req.get('user-agent');
|
|
22
|
+
req.body.client_user_agent = userAgent === 'string'
|
|
23
|
+
? userAgent.substring(0, 255)
|
|
24
|
+
: '';
|
|
22
25
|
if (!validate(checkoutBody)) {
|
|
23
26
|
return sendRequestError(res, '@checkout', validate.errors);
|
|
24
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkout.js","sourceRoot":"","sources":["../../src/firebase/checkout.ts"],"names":[],"mappings":"AASA,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,QAAQ,MAAM,gCAAgC,CAAC;AACtD,OAAO,aAAa,MAAM,qCAAqC,CAAC;AAChE,OAAO,aAAa,MAAM,wCAAwC,CAAC;AACnE,OAAO,EACL,SAAS,EACT,SAAS,EACT,eAAe,EACf,sBAAsB,EACtB,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,4BAA4B,CAAC;AACpC,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAEzD,eAAe,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IACnD,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;IAC9C,MAAM,cAAc,GAAG,GAAG,CAAC,QAAQ,KAAK,WAAW;QACjD,CAAC,CAAC,WAAW,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,EAAE;QACrE,CAAC,CAAC,yBAAyB,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE;cACnD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,oBAAoB,CAAC,MAAM,CAAC,UAAU,CAAC;IAEjF,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,GAAG,CAAC,IAAoB,CAAC;IAC9C,GAAG,CAAC,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC,EAAE,CAAC;IAC5B,GAAG,CAAC,IAAI,CAAC,iBAAiB,GAAG,
|
|
1
|
+
{"version":3,"file":"checkout.js","sourceRoot":"","sources":["../../src/firebase/checkout.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,10 @@ export default async (req: Request, res: Response) => {
|
|
|
33
33
|
const validate = ajv.compile(checkoutSchema.params);
|
|
34
34
|
const checkoutBody = req.body as CheckoutBody;
|
|
35
35
|
req.body.client_ip = req.ip;
|
|
36
|
-
|
|
36
|
+
const userAgent = req.get('user-agent');
|
|
37
|
+
req.body.client_user_agent = userAgent === 'string'
|
|
38
|
+
? userAgent.substring(0, 255)
|
|
39
|
+
: '';
|
|
37
40
|
if (!validate(checkoutBody)) {
|
|
38
41
|
return sendRequestError(res, '@checkout', validate.errors);
|
|
39
42
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudcommerce/ssr",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.6.0",
|
|
5
5
|
"description": "E-Com Plus Cloud Commerce storefront SSR",
|
|
6
6
|
"main": "lib/index.js",
|
|
7
7
|
"exports": {
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"build": "sh ../../scripts/build-lib.sh"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@astrojs/image": "^0.14.
|
|
26
|
+
"@astrojs/image": "^0.14.1",
|
|
27
27
|
"@astrojs/node": "^5.0.3",
|
|
28
28
|
"@cloudcommerce/api": "workspace:*",
|
|
29
29
|
"@cloudcommerce/firebase": "workspace:*",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"@ecomplus/utils": "1.5.0-rc.3",
|
|
32
32
|
"@headlessui/vue": "^1.7.9",
|
|
33
33
|
"@vueuse/core": "^9.12.0",
|
|
34
|
-
"astro": "^2.0.
|
|
34
|
+
"astro": "^2.0.10",
|
|
35
35
|
"firebase-admin": "^11.5.0",
|
|
36
36
|
"firebase-functions": "^4.2.1",
|
|
37
37
|
"image-size": "^1.0.2",
|
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
/// <reference types="./src/vue-globals" />
|
|
2
2
|
|
|
3
|
+
type DocCleanupFields = 'body_html'
|
|
4
|
+
| 'body_text'
|
|
5
|
+
| 'meta_title'
|
|
6
|
+
| 'meta_description'
|
|
7
|
+
| 'i18n'
|
|
8
|
+
| 'metafields'
|
|
9
|
+
| 'hidden_metafields';
|
|
10
|
+
|
|
3
11
|
interface Window {
|
|
4
12
|
firebaseConfig?: {
|
|
5
13
|
apiKey: string,
|
|
@@ -16,10 +24,22 @@ interface Window {
|
|
|
16
24
|
ECOM_CURRENCY_SYMBOL: string;
|
|
17
25
|
ECOM_COUNTRY_CODE: string;
|
|
18
26
|
storefront?: {
|
|
19
|
-
settings: import('./src/lib/
|
|
27
|
+
settings: import('./src/lib/cms').CmsSettings,
|
|
20
28
|
context?: {
|
|
21
|
-
resource:
|
|
22
|
-
doc:
|
|
29
|
+
resource: 'products',
|
|
30
|
+
doc: Omit<import('@cloudcommerce/api/types').ProductSet, DocCleanupFields>,
|
|
31
|
+
timestamp: number,
|
|
32
|
+
} | {
|
|
33
|
+
resource: 'categories',
|
|
34
|
+
doc: Omit<import('@cloudcommerce/api/types').CategorySet, DocCleanupFields>,
|
|
35
|
+
timestamp: number,
|
|
36
|
+
} | {
|
|
37
|
+
resource: 'brands',
|
|
38
|
+
doc: Omit<import('@cloudcommerce/api/types').BrandSet, DocCleanupFields>,
|
|
39
|
+
timestamp: number,
|
|
40
|
+
} | {
|
|
41
|
+
resource: 'collections',
|
|
42
|
+
doc: Omit<import('@cloudcommerce/api/types').CollectionSet, DocCleanupFields>,
|
|
23
43
|
timestamp: number,
|
|
24
44
|
},
|
|
25
45
|
modulesInfoPreset?: Partial<typeof import('./src/lib/state/modules-info').default>,
|
|
@@ -13,12 +13,38 @@ module.exports = () => {
|
|
|
13
13
|
const dirContent = resolvePath(baseDir, 'content');
|
|
14
14
|
|
|
15
15
|
const cms = (filename) => {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
// MUST be sync for 'settings'
|
|
17
|
+
// Async with other content to support external CMS integration
|
|
18
|
+
const loadLocal = () => {
|
|
19
|
+
if (filename.endsWith('/')) {
|
|
20
|
+
const dirColl = resolvePath(dirContent, filename);
|
|
21
|
+
return new Promise((resolve) => {
|
|
22
|
+
const slugs = fs.existsSync(dirColl)
|
|
23
|
+
? fs.readdirSync(dirColl).map((file) => file.replace('.json', ''))
|
|
24
|
+
: [];
|
|
25
|
+
resolve(slugs);
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
const filepath = resolvePath(dirContent, `${filename}.json`);
|
|
29
|
+
const content = fs.existsSync(filepath)
|
|
30
|
+
? JSON.parse(fs.readFileSync(filepath, 'utf8'))
|
|
31
|
+
: null;
|
|
32
|
+
return filename === 'settings'
|
|
33
|
+
? content
|
|
34
|
+
: new Promise((resolve) => { resolve(content); });
|
|
35
|
+
};
|
|
36
|
+
const handler = globalThis.storefront_cms_handler;
|
|
37
|
+
if (typeof handler === 'function') {
|
|
38
|
+
try {
|
|
39
|
+
const content = handler({ dirContent, filename, loadLocal });
|
|
40
|
+
if (content) {
|
|
41
|
+
return content;
|
|
42
|
+
}
|
|
43
|
+
} catch {
|
|
44
|
+
//
|
|
45
|
+
}
|
|
19
46
|
}
|
|
20
|
-
|
|
21
|
-
return JSON.parse(fs.readFileSync(filepath, 'utf8'));
|
|
47
|
+
return loadLocal();
|
|
22
48
|
};
|
|
23
49
|
|
|
24
50
|
let settings;
|