Merge branch 'main' into feat/correios-v2

ecomplus · Oct 10, 2023 · 4cfe60e · 4cfe60e
2 parents e71f884 + e5128f6
commit 4cfe60e
Show file tree

Hide file tree

Showing 79 changed files with 1,030 additions and 280 deletions.
diff --git a/.github/workflows/test-apps.yml b/.github/workflows/test-apps.yml
@@ -106,11 +106,11 @@ jobs:
             ${{ steps.npm-paths.outputs.LIB_PATH }}
             ${{ steps.npm-paths.outputs.BIN_PATH }}
             ~/.npm-global/bin
-          key: ${{ runner.os }}-npm-globals-firebase-tools-12.6.1
+          key: ${{ runner.os }}-npm-globals-firebase-tools-12.6.2
 
       - if: steps.npm-g-cache.outputs.cache-hit != 'true'
         shell: bash
-        run: npm install -g firebase-tools@12.6.1
+        run: npm install -g firebase-tools@12.6.2
 
       - name: Initialize Firebase emulators
         shell: bash

diff --git a/.gitmodules b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "ecomplus-stores/tia-sonia"]
 	path = ecomplus-stores/tia-sonia
 	url = git@github.com:ecomplus-stores/tia-sonia.git
-[submodule "ecomplus-stores/iluminim"]
-	path = ecomplus-stores/iluminim
-	url = git@github.com:ecomplus-stores/iluminim.git
 [submodule "ecomplus-stores/barra-doce"]
 	path = ecomplus-stores/barra-doce
 	url = git@github.com:ecomplus-stores/barra-doce.git
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -18,7 +18,6 @@
     "store/functions/ssr/tailwind.config.cjs": "store/**",
     "ecomplus-stores/monocard/functions/ssr/tailwind.config.cjs": "ecomplus-stores/monocard/**",
     "ecomplus-stores/tia-sonia/functions/ssr/tailwind.config.cjs": "ecomplus-stores/tia-sonia/**",
-    "ecomplus-stores/iluminim/functions/ssr/tailwind.config.cjs": "ecomplus-stores/iluminim/**",
     "ecomplus-stores/barra-doce/functions/ssr/tailwind.config.cjs": "ecomplus-stores/barra-doce/**"
   },
   "typescript.tsdk": "node_modules/typescript/lib"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,57 @@
 
 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.
 
+## [0.28.0](https://github.com/ecomplus/cloud-commerce/compare/v0.27.0...v0.28.0) (2023-10-06)
+
+
+### ⚠ BREAKING CHANGES
+
+* **storefront:** content/layout.json must be edited with fields in camelCase
+* Content `settings` object (and `config.settingsContent`) changed
+* **storefront:** `PageContent` interface editted, content/pages hero and sections must be updated with new fields in camelCase
+
+### Bug Fixes
+
+* **loyalty points:** Add points after some days gap with cron to prevent fast cancellations ([#250](https://github.com/ecomplus/cloud-commerce/issues/250)) ([4eb705c](https://github.com/ecomplus/cloud-commerce/commit/4eb705cea98884255745ae7222bb8e2a264e625a))
+* **mercadopago:** Updating with https://github.com/ecomplus/app-mercadopago/commit/0205afd64e31fc19776343b8a355d43deb6a911d ([#249](https://github.com/ecomplus/cloud-commerce/issues/249)) ([47a03e6](https://github.com/ecomplus/cloud-commerce/commit/47a03e60551d9fb2e17a079cedff00106b05e967))
+* **storefront:** Minor fix `<ContentClearfix>` with horizontal scroll on large devices ([03b1d8d](https://github.com/ecomplus/cloud-commerce/commit/03b1d8da4fb01f0bc8dc7701ff71ad9ce0bdd858))
+
+
+* Edit settings types to camelCase fields ([47aec28](https://github.com/ecomplus/cloud-commerce/commit/47aec28bffd1e33ed2b2d715aac7611cf2ef3403))
+* **storefront:** Expect hero/sections content with camelCase for easy parsing and props bypass ([70d976b](https://github.com/ecomplus/cloud-commerce/commit/70d976b1b1600fff9772db275bb57d85b08dc07e))
+* **storefront:** Expect layout content fields camelCase ([e9404ea](https://github.com/ecomplus/cloud-commerce/commit/e9404ea61f72a5aa50858104ee58b1c3b1d88d9e))
+
+## [0.27.0](https://github.com/ecomplus/cloud-commerce/compare/v0.26.7...v0.27.0) (2023-10-06)
+
+
+### ⚠ BREAKING CHANGES
+
+* **storefront:** Astro.locals.contextInlineClientJS no more set
+* **storefront:** <Carousel> API changed, using explicit `index` prop with model instead of default (value) `v-model`, edited binds on controls slot
+* **storefront:** Component ContentClearfix.astro is removed in favor of .vue one
+
+### Features
+
+* **storefront:** Add new prop `preferredSize` to global <AImg> component ([d2387d4](https://github.com/ecomplus/cloud-commerce/commit/d2387d4a20b7e2343399674b4f73bd7dee70f879))
+* **storefront:** Auto import Vue composition API and other helper exports ([9e92931](https://github.com/ecomplus/cloud-commerce/commit/9e929316277f0162ff55a1c86792697dc50867e5))
+* **storefront:** New prop `hasControls` to <Carousel> ([017d5c9](https://github.com/ecomplus/cloud-commerce/commit/017d5c9f8eb9f927e463b8a7d5c6f1f811d839f5))
+* **storefront:** Update <Carousel> with new optional `axis` prop for vertical slide ([21e3a02](https://github.com/ecomplus/cloud-commerce/commit/21e3a02799bb52e573856a4304032315e060410b))
+* **tiny-erp:** Updating with https://github.com/ecomplus/app-tiny-erp ([#218](https://github.com/ecomplus/cloud-commerce/issues/218)) ([a5ffd26](https://github.com/ecomplus/cloud-commerce/commit/a5ffd26808ddc5609492a39363ce265d3ded3f26))
+
+
+### Bug Fixes
+
+* **deps:** Update non-major dependencies ([#248](https://github.com/ecomplus/cloud-commerce/issues/248)) ([344927b](https://github.com/ecomplus/cloud-commerce/commit/344927bb69b3be5c5ec1e43dc0b38246a04f256a))
+* **storefront:** Add hardfix on base CSS to hide duplicated drawer backdrops (with "SPA" mode) ([91ce452](https://github.com/ecomplus/cloud-commerce/commit/91ce452b50bd210999c8c228adcf744fa763a5be))
+* **storefront:** Disable View Transitions fallback (Firefox) by default (for now) ([deb58ff](https://github.com/ecomplus/cloud-commerce/commit/deb58ff34c9bf3f58e3f961a060d062bad3518a3))
+* **storefront:** Fixing global `$storefront.apiContext.doc` types with full resources interfaces ([c28ce11](https://github.com/ecomplus/cloud-commerce/commit/c28ce118325a7aac9409d8d3535b95879b3ea021))
+* **storefront:** Properly dealing with API Context on View Transitions ([e254116](https://github.com/ecomplus/cloud-commerce/commit/e2541161f696ccd5da8403d8d7bea0e9c33131fc))
+* **storefront:** Properly sync <Carousel> index on prop change ([6237934](https://github.com/ecomplus/cloud-commerce/commit/6237934cdf5c70c47d7269c0dd35125b427bd30a))
+* **storefront:** Setup custom <ViewTransitions> with fixed head script exec and browser fallback ([2e53207](https://github.com/ecomplus/cloud-commerce/commit/2e5320718bfa76c6e7f6258031a546e3f9089aa4))
+
+
+* **storefront:** Move <ContentClearfix> to Vue component instead of Astro one ([e6ca8c4](https://github.com/ecomplus/cloud-commerce/commit/e6ca8c4bbe5f8f42de15d852273dd9ae2575c136))
+
 ### [0.26.7](https://github.com/ecomplus/cloud-commerce/compare/v0.26.6...v0.26.7) (2023-09-18)
 
 

diff --git a/action.yml b/action.yml
@@ -139,11 +139,11 @@ runs:
           ${{ steps.npm-paths.outputs.LIB_PATH }}
           ${{ steps.npm-paths.outputs.BIN_PATH }}
           ~/.npm-global/bin
-        key: ${{ runner.os }}-npm-g-firebase-tools-12.6.1
+        key: ${{ runner.os }}-npm-g-firebase-tools-12.6.2
 
     - if: ${{ github.event_name == 'push' && steps.npm-g-cache.outputs.cache-hit != 'true' }}
       shell: bash
-      run: npm i --location=global firebase-tools@12.6.1
+      run: npm i --location=global firebase-tools@12.6.2
 
     - if: steps.npm-cache-many.outputs.cache-hit != 'true'
       name: Install codebase "many" dependencies

diff --git a/ecomplus-stores/barra-doce b/ecomplus-stores/barra-doce
diff --git a/ecomplus-stores/iluminim b/ecomplus-stores/iluminim
diff --git a/ecomplus-stores/monocard b/ecomplus-stores/monocard
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cloudcommerce",
   "type": "module",
-  "version": "0.26.7",
+  "version": "0.28.0",
   "description": "Open fair-code headless commerce platform: API-first, microservices based, event driven and cloud native",
   "main": "packages/api/lib/index.js",
   "author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
@@ -35,15 +35,15 @@
     "@commitlint/cli": "^17.7.2",
     "@commitlint/config-conventional": "^17.7.0",
     "@commitlint/rules": "^17.7.0",
-    "@types/node": "^18.18.1",
-    "eslint": "^8.50.0",
+    "@types/node": "^18.18.4",
+    "eslint": "^8.51.0",
     "husky": "^8.0.3",
     "standard-version": "^9.5.0",
     "ts-node": "^10.9.1",
-    "turbo": "^1.10.14",
+    "turbo": "^1.10.15",
     "typescript": "~5.0.4",
     "uglify-js": "^3.17.4",
-    "vite": "^4.4.9",
+    "vite": "^4.4.11",
     "vitest": "^0.34.6",
     "zx": "^7.2.3"
   },

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/api",
   "type": "module",
-  "version": "0.26.7",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce APIs client/adapter",
   "main": "lib/api.js",
   "types": "lib/api.d.ts",

diff --git a/packages/apps/affilate-program/package.json b/packages/apps/affilate-program/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-affilate-program",
   "type": "module",
-  "version": "0.26.7",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce app for simple affiliate program",
   "main": "lib/index.js",
   "repository": {

diff --git a/packages/apps/correios/package.json b/packages/apps/correios/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-correios",
   "type": "module",
-  "version": "0.26.7",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce app for Correios shipping calculation",
   "main": "lib/correios.js",
   "repository": {
@@ -27,4 +27,4 @@
     "@cloudcommerce/test-base": "workspace:*",
     "@cloudcommerce/types": "workspace:*"
   }
-}
+}
diff --git a/packages/apps/custom-payment/package.json b/packages/apps/custom-payment/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-custom-payment",
   "type": "module",
-  "version": "0.26.7",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce app for simple custom payment methods",
   "main": "lib/index.js",
   "repository": {

diff --git a/packages/apps/custom-shipping/package.json b/packages/apps/custom-shipping/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-custom-shipping",
   "type": "module",
-  "version": "0.26.7",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce app for custom shipping methods",
   "main": "lib/custom-shipping.js",
   "repository": {

diff --git a/packages/apps/datafrete/package.json b/packages/apps/datafrete/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-datafrete",
   "type": "module",
-  "version": "0.26.7",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Datafrete shipping gateway ",
   "main": "lib/datafrete.js",
   "exports": {

diff --git a/packages/apps/discounts/package.json b/packages/apps/discounts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-discounts",
   "type": "module",
-  "version": "0.26.7",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce app for complex discount rules",
   "main": "lib/discounts.js",
   "repository": {

diff --git a/packages/apps/emails/package.json b/packages/apps/emails/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-emails",
   "type": "module",
-  "version": "0.26.7",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce default transactional email app",
   "main": "lib/index.js",
   "repository": {

diff --git a/packages/apps/emails/src/functios-lib/utils.ts b/packages/apps/emails/src/functios-lib/utils.ts
@@ -29,7 +29,7 @@ const getStore = () => {
     lang: settingsContent.lang,
     domain: settingsContent.domain,
     name: settingsContent.name,
-    corporate_name: settingsContent.corporate_name || settingsContent.name,
+    corporate_name: settingsContent.corporateName || settingsContent.name,
     contact_email: settingsContent.email,
     logo: {
       url: `https://${settingsContent.domain}${settingsContent.logo}`,

diff --git a/packages/apps/fb-conversions/package.json b/packages/apps/fb-conversions/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-fb-conversions",
   "type": "module",
-  "version": "0.26.7",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce app to send carts/orders to Facebook Conversions API",
   "main": "lib/index.js",
   "repository": {

diff --git a/packages/apps/flash-courier/package.json b/packages/apps/flash-courier/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-flash-courier",
   "type": "module",
-  "version": "0.26.7",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Flash Courier",
   "main": "lib/index.js",
   "exports": {

diff --git a/packages/apps/frenet/package.json b/packages/apps/frenet/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-frenet",
   "type": "module",
-  "version": "0.26.7",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce app for Frenet shipping calculation",
   "main": "lib/frenet.js",
   "exports": {

diff --git a/packages/apps/galaxpay/package.json b/packages/apps/galaxpay/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-galaxpay",
   "type": "module",
-  "version": "0.26.7",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Galax Pay for recurring payments",
   "main": "lib/galaxpay.js",
   "exports": {

diff --git a/packages/apps/google-analytics/package.json b/packages/apps/google-analytics/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-google-analytics",
   "type": "module",
-  "version": "0.26.7",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce app to send carts/orders events to GA Measurement Protocol",
   "main": "lib/index.js",
   "repository": {

diff --git a/packages/apps/jadlog/package.json b/packages/apps/jadlog/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-jadlog",
   "type": "module",
-  "version": "0.26.7",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce  app for Jadlog shipping calculation",
   "main": "lib/index.js",
   "repository": {

diff --git a/packages/apps/loyalty-points/package.json b/packages/apps/loyalty-points/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-loyalty-points",
   "type": "module",
-  "version": "0.26.7",
+  "version": "0.28.0",
   "description": "E-Com Plus Cloud Commerce app to handle simple loyalty points programs",
   "main": "lib/loyalty-points.js",
   "exports": {
@@ -25,7 +25,8 @@
   },
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
-    "@cloudcommerce/firebase": "workspace:*"
+    "@cloudcommerce/firebase": "workspace:*",
+    "@ecomplus/utils": "1.5.0-rc.5"
   },
   "devDependencies": {
     "@cloudcommerce/test-base": "workspace:*",