cloudcommerce 0.37.1 → 0.38.0

package/.github/workflows/test-apps.yml

@@ -104,11 +104,11 @@ jobs:
             ${{ steps.npm-paths.outputs.LIB_PATH }}
             ${{ steps.npm-paths.outputs.BIN_PATH }}
             ~/.npm-global/bin
-          key: ${{ runner.os }}-npm-globals-firebase-tools-13.0.0
+          key: ${{ runner.os }}-npm-globals-firebase-tools-13.0.1
 
       - if: steps.npm-g-cache.outputs.cache-hit != 'true'
         shell: bash
-        run: npm install -g firebase-tools@13.0.0
+        run: npm install -g firebase-tools@13.0.1
 
       - name: Initialize Firebase emulators
         shell: bash

package/.vscode/settings.json

@@ -3,7 +3,7 @@
     "strings": true
   },
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "files.associations": {
     "*.css": "tailwindcss"

package/CHANGELOG.md

@@ -2,6 +2,42 @@
 
 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.38.0](https://github.com/ecomplus/cloud-commerce/compare/v0.37.1...v0.38.0) (2023-12-13)
+
+
+### ⚠ BREAKING CHANGES
+
+* **deps:** Astro major version update
+* **storefront:** Return of `useSearchModal` composable refactored
+
+### Features
+
+* **cli:** Keep user Firebase config files from `/conf` path if any ([4c96a25](https://github.com/ecomplus/cloud-commerce/commit/4c96a25f253e52bce6eacb216bdb78f59f2f77be))
+* **cli:** Update default Firestore rules to allow creation on forms colelction ([54d1ff6](https://github.com/ecomplus/cloud-commerce/commit/54d1ff6dd0885c39c420c57418313bace7cb30f3))
+* **deps:** Bump Vite to v5 and Astro to v4 ([f7dab35](https://github.com/ecomplus/cloud-commerce/commit/f7dab3546f331915e840e7af578284e32a1957cd))
+* **storefront:** Accepting `term = null` on search method for no term filter search ([06f66a8](https://github.com/ecomplus/cloud-commerce/commit/06f66a8036dc637fa9bcaccfc50c0db7361c7a95))
+* **storefront:** Adding search term to page title on SSR ([950a100](https://github.com/ecomplus/cloud-commerce/commit/950a100a0bb7c05f03ac7280e08eb79a045f7be3))
+* **storefront:** New `scripts/firestore` with abstractions for forms docs and app check support ([4b39c0d](https://github.com/ecomplus/cloud-commerce/commit/4b39c0d89541dc01ce9d03d6f0f13116d0a5be19))
+* **storefront:** New properties on `SearchEngine` to control fetching state and promises ([7c45cc7](https://github.com/ecomplus/cloud-commerce/commit/7c45cc731b241438b1a6367ac2af62117f906323))
+* **storefront:** New SSR route context properties `isSearchPage` and `searchPageTerm` ([53e1dcb](https://github.com/ecomplus/cloud-commerce/commit/53e1dcb99babea36136168b2842f6c3b85418330))
+* **storefront:** New Tailwind/UnoCSS variant `sticky-header:` ([de941a6](https://github.com/ecomplus/cloud-commerce/commit/de941a68f0b4cec95053ca7dc77b9638f5ad49f7))
+* **storefront:** New utils: `toLowerCaseAccents`, `termify` and `getSearchUrl` ([e75fb37](https://github.com/ecomplus/cloud-commerce/commit/e75fb3712530c3f015c0f0b510162e04cb5acf09))
+* **storefront:** Setting up `useSearchContainer` composable and and `search-container` section ([6ffb202](https://github.com/ecomplus/cloud-commerce/commit/6ffb20252e1279a00cc585a028857bca363d3c91))
+* **storefront:** Update `useStickyHeader` composable to toggle body class ".StickyHeader" ([afc0e0f](https://github.com/ecomplus/cloud-commerce/commit/afc0e0f09b1d3f74f062fe0e38990df3abd97d23))
+
+
+### Bug Fixes
+
+* **api:** Updating `ResourceAndFind` typedef adding stores/me and authentications/me endpoints ([0c514e9](https://github.com/ecomplus/cloud-commerce/commit/0c514e91d6a7b98f78e51e9bd21dacfff208e9f0))
+* **cli:** Fix default Firestore rules to enable creation on _forms_ subcolls ([21c40c5](https://github.com/ecomplus/cloud-commerce/commit/21c40c57d8f32412d242d303b5c1e57b3377f26b))
+* **deps:** Update non-major dependencies ([#286](https://github.com/ecomplus/cloud-commerce/issues/286)) ([d35aaa9](https://github.com/ecomplus/cloud-commerce/commit/d35aaa9b4014f7dd3e835cf61b37fd1eae7a0663))
+* **storefront:** Better generating brand colors pallete on Tailwind/UnoCSS config ([b85f9df](https://github.com/ecomplus/cloud-commerce/commit/b85f9df973c6221d2dd20783e89cc934e26ca60f))
+* **storefront:** Update shop header to search submit redirecting to /s/term indexable URL ([c57a2a3](https://github.com/ecomplus/cloud-commerce/commit/c57a2a3573a4c07904be941a1577454f9dd3ecde))
+* **storefront:** Update Vue to v3.3.11 ([#287](https://github.com/ecomplus/cloud-commerce/issues/287)) ([d514012](https://github.com/ecomplus/cloud-commerce/commit/d514012ca73337bdda341108a0f1fe3ea6ac183f))
+
+
+* **storefront:** Renaming `useSearchModal` returned `products` ([cd44b51](https://github.com/ecomplus/cloud-commerce/commit/cd44b513bcec27aea0c9301d99aa5cbf7c9b1ae5))
+
 ### [0.37.1](https://github.com/ecomplus/cloud-commerce/compare/v0.37.0...v0.37.1) (2023-12-07)
 
 

package/action.yml

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

package/ecomplus-stores/barra-doce/functions/many/package.json

@@ -15,8 +15,8 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@cloudcommerce/feeds": "^0.37.0",
-    "@cloudcommerce/firebase": "^0.37.0",
-    "@cloudcommerce/passport": "^0.37.0"
+    "@cloudcommerce/feeds": "^0.37.1",
+    "@cloudcommerce/firebase": "^0.37.1",
+    "@cloudcommerce/passport": "^0.37.1"
   }
 }

package/ecomplus-stores/barra-doce/functions/ssr/package.json

@@ -17,15 +17,15 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@cloudcommerce/api": "^0.37.0",
-    "@cloudcommerce/firebase": "^0.37.0",
-    "@cloudcommerce/ssr": "^0.37.0",
+    "@cloudcommerce/api": "^0.37.1",
+    "@cloudcommerce/firebase": "^0.37.1",
+    "@cloudcommerce/ssr": "^0.37.1",
     "@headlessui/vue": "^1.7.16"
   },
   "devDependencies": {
-    "@cloudcommerce/i18n": "^0.37.0",
-    "@cloudcommerce/storefront": "^0.37.0",
-    "@cloudcommerce/types": "^0.37.0",
+    "@cloudcommerce/i18n": "^0.37.1",
+    "@cloudcommerce/storefront": "^0.37.1",
+    "@cloudcommerce/types": "^0.37.1",
     "@fontsource/croissant-one": "^5.0.17",
     "@iconify-json/mingcute": "^1.1.11",
     "photoswipe": "^5.4.2"

package/ecomplus-stores/barra-doce/functions/with-apps/package.json

@@ -15,8 +15,8 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@cloudcommerce/events": "^0.37.0",
-    "@cloudcommerce/firebase": "^0.37.0",
-    "@cloudcommerce/modules": "^0.37.0"
+    "@cloudcommerce/events": "^0.37.1",
+    "@cloudcommerce/firebase": "^0.37.1",
+    "@cloudcommerce/modules": "^0.37.1"
   }
 }

package/ecomplus-stores/barra-doce/package.json

@@ -23,9 +23,9 @@
     "url": "https://github.com/ecomplus/cloud-commerce/issues"
   },
   "dependencies": {
-    "@cloudcommerce/cli": "^0.37.0"
+    "@cloudcommerce/cli": "^0.37.1"
   },
   "devDependencies": {
-    "@cloudcommerce/eslint": "^0.37.0"
+    "@cloudcommerce/eslint": "^0.37.1"
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloudcommerce",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.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>",
@@ -19,18 +19,18 @@
     "@commitlint/cli": "^18.4.3",
     "@commitlint/config-conventional": "^18.4.3",
     "@commitlint/rules": "^18.4.3",
-    "@types/node": "^18.19.2",
+    "@types/node": "^18.19.3",
     "eslint": "^8.55.0",
     "husky": "^8.0.3",
     "standard-version": "^9.5.0",
-    "ts-node": "^10.9.1",
-    "turbo": "^1.10.16",
+    "ts-node": "^10.9.2",
+    "turbo": "^1.11.1",
     "typescript": "~5.2.2",
     "uglify-js": "^3.17.4",
-    "vite": "^4.5.1",
-    "vitest": "^0.34.6",
+    "vite": "^5.0.8",
+    "vitest": "^1.0.4",
     "zx": "^7.2.3",
-    "@cloudcommerce/eslint": "0.37.1"
+    "@cloudcommerce/eslint": "0.38.0"
   },
   "scripts": {
     "fix-install": "bash scripts/pre-install.sh && pnpm i",

package/packages/api/lib/api.d.ts

@@ -59,7 +59,7 @@ declare const api: {
             _id: import("../types.d").ResourceId;
         };
     }>;
-    put: <E_1 extends import("../types.d").ResourceAndFind | `products/${import("../types.d").ResourceId}/${string}` | `categories/${import("../types.d").ResourceId}/${string}` | `brands/${import("../types.d").ResourceId}/${string}` | `collections/${import("../types.d").ResourceId}/${string}` | `grids/${import("../types.d").ResourceId}/${string}` | `carts/${import("../types.d").ResourceId}/${string}` | `orders/${import("../types.d").ResourceId}/${string}` | `customers/${import("../types.d").ResourceId}/${string}` | `stores/${import("../types.d").ResourceId}/${string}` | `applications/${import("../types.d").ResourceId}/${string}` | `authentications/${import("../types.d").ResourceId}/${string}` | `products/${string}:${string}/${string}` | `categories/${string}:${string}/${string}` | `brands/${string}:${string}/${string}` | `collections/${string}:${string}/${string}` | `grids/${string}:${string}/${string}` | `carts/${string}:${string}/${string}` | `orders/${string}:${string}/${string}` | `customers/${string}:${string}/${string}` | `stores/${string}:${string}/${string}` | `applications/${string}:${string}/${string}` | `authentications/${string}:${string}/${string}` | `slugs/${string}` | ("search/v1" | `search/v1?${string}` | "search/_els" | `search/_els?${string}`) | ("events/products" | "events/categories" | "events/brands" | "events/collections" | "events/grids" | "events/carts" | "events/orders" | "events/customers" | "events/stores" | "events/applications" | "events/authentications" | `events/products/${import("../types.d").ResourceId}` | `events/categories/${import("../types.d").ResourceId}` | `events/brands/${import("../types.d").ResourceId}` | `events/collections/${import("../types.d").ResourceId}` | `events/grids/${import("../types.d").ResourceId}` | `events/carts/${import("../types.d").ResourceId}` | `events/orders/${import("../types.d").ResourceId}` | `events/customers/${import("../types.d").ResourceId}` | `events/stores/${import("../types.d").ResourceId}` | `events/applications/${import("../types.d").ResourceId}` | `events/authentications/${import("../types.d").ResourceId}` | "events/me") | "login" | "authenticate" | "ask-auth-callback" | "check-username" | "$aggregate/products" | "$aggregate/categories" | "$aggregate/brands" | "$aggregate/collections" | "$aggregate/grids" | "$aggregate/carts" | "$aggregate/orders" | "$aggregate/customers" | "schemas/products" | "schemas/categories" | "schemas/brands" | "schemas/collections" | "schemas/grids" | "schemas/carts" | "schemas/orders" | "schemas/customers" | "schemas/stores" | "schemas/applications" | "schemas/authentications", C_1 extends AbstractedConfig>(endpoint: E_1, body: RequestBody<{
+    put: <E_1 extends import("../types.d").ResourceAndFind | `products/${import("../types.d").ResourceId}/${string}` | `categories/${import("../types.d").ResourceId}/${string}` | `brands/${import("../types.d").ResourceId}/${string}` | `collections/${import("../types.d").ResourceId}/${string}` | `grids/${import("../types.d").ResourceId}/${string}` | `carts/${import("../types.d").ResourceId}/${string}` | `orders/${import("../types.d").ResourceId}/${string}` | `customers/${import("../types.d").ResourceId}/${string}` | `stores/${import("../types.d").ResourceId}/${string}` | `applications/${import("../types.d").ResourceId}/${string}` | `authentications/${import("../types.d").ResourceId}/${string}` | `products/${string}:${string}/${string}` | `categories/${string}:${string}/${string}` | `brands/${string}:${string}/${string}` | `collections/${string}:${string}/${string}` | `grids/${string}:${string}/${string}` | `carts/${string}:${string}/${string}` | `orders/${string}:${string}/${string}` | `customers/${string}:${string}/${string}` | `stores/${string}:${string}/${string}` | `applications/${string}:${string}/${string}` | `authentications/${string}:${string}/${string}` | `stores/me/${string}` | `authentications/me/${string}` | `slugs/${string}` | ("search/v1" | `search/v1?${string}` | "search/_els" | `search/_els?${string}`) | ("events/products" | "events/categories" | "events/brands" | "events/collections" | "events/grids" | "events/carts" | "events/orders" | "events/customers" | "events/stores" | "events/applications" | "events/authentications" | `events/products/${import("../types.d").ResourceId}` | `events/categories/${import("../types.d").ResourceId}` | `events/brands/${import("../types.d").ResourceId}` | `events/collections/${import("../types.d").ResourceId}` | `events/grids/${import("../types.d").ResourceId}` | `events/carts/${import("../types.d").ResourceId}` | `events/orders/${import("../types.d").ResourceId}` | `events/customers/${import("../types.d").ResourceId}` | `events/stores/${import("../types.d").ResourceId}` | `events/applications/${import("../types.d").ResourceId}` | `events/authentications/${import("../types.d").ResourceId}` | "events/me") | "login" | "authenticate" | "ask-auth-callback" | "check-username" | "$aggregate/products" | "$aggregate/categories" | "$aggregate/brands" | "$aggregate/collections" | "$aggregate/grids" | "$aggregate/carts" | "$aggregate/orders" | "$aggregate/customers" | "schemas/products" | "schemas/categories" | "schemas/brands" | "schemas/collections" | "schemas/grids" | "schemas/carts" | "schemas/orders" | "schemas/customers" | "schemas/stores" | "schemas/applications" | "schemas/authentications", C_1 extends AbstractedConfig>(endpoint: E_1, body: RequestBody<{
         endpoint: E_1;
         method: 'put';
     }>, config?: C_1 | undefined) => Promise<Response & {
@@ -103,7 +103,7 @@ declare const post: <E extends Endpoint, C extends AbstractedConfig>(endpoint: E
         _id: import("../types.d").ResourceId;
     };
 }>;
-declare const put: <E extends import("../types.d").ResourceAndFind | `products/${import("../types.d").ResourceId}/${string}` | `categories/${import("../types.d").ResourceId}/${string}` | `brands/${import("../types.d").ResourceId}/${string}` | `collections/${import("../types.d").ResourceId}/${string}` | `grids/${import("../types.d").ResourceId}/${string}` | `carts/${import("../types.d").ResourceId}/${string}` | `orders/${import("../types.d").ResourceId}/${string}` | `customers/${import("../types.d").ResourceId}/${string}` | `stores/${import("../types.d").ResourceId}/${string}` | `applications/${import("../types.d").ResourceId}/${string}` | `authentications/${import("../types.d").ResourceId}/${string}` | `products/${string}:${string}/${string}` | `categories/${string}:${string}/${string}` | `brands/${string}:${string}/${string}` | `collections/${string}:${string}/${string}` | `grids/${string}:${string}/${string}` | `carts/${string}:${string}/${string}` | `orders/${string}:${string}/${string}` | `customers/${string}:${string}/${string}` | `stores/${string}:${string}/${string}` | `applications/${string}:${string}/${string}` | `authentications/${string}:${string}/${string}` | `slugs/${string}` | ("search/v1" | `search/v1?${string}` | "search/_els" | `search/_els?${string}`) | ("events/products" | "events/categories" | "events/brands" | "events/collections" | "events/grids" | "events/carts" | "events/orders" | "events/customers" | "events/stores" | "events/applications" | "events/authentications" | `events/products/${import("../types.d").ResourceId}` | `events/categories/${import("../types.d").ResourceId}` | `events/brands/${import("../types.d").ResourceId}` | `events/collections/${import("../types.d").ResourceId}` | `events/grids/${import("../types.d").ResourceId}` | `events/carts/${import("../types.d").ResourceId}` | `events/orders/${import("../types.d").ResourceId}` | `events/customers/${import("../types.d").ResourceId}` | `events/stores/${import("../types.d").ResourceId}` | `events/applications/${import("../types.d").ResourceId}` | `events/authentications/${import("../types.d").ResourceId}` | "events/me") | "login" | "authenticate" | "ask-auth-callback" | "check-username" | "$aggregate/products" | "$aggregate/categories" | "$aggregate/brands" | "$aggregate/collections" | "$aggregate/grids" | "$aggregate/carts" | "$aggregate/orders" | "$aggregate/customers" | "schemas/products" | "schemas/categories" | "schemas/brands" | "schemas/collections" | "schemas/grids" | "schemas/carts" | "schemas/orders" | "schemas/customers" | "schemas/stores" | "schemas/applications" | "schemas/authentications", C extends AbstractedConfig>(endpoint: E, body: RequestBody<{
+declare const put: <E extends import("../types.d").ResourceAndFind | `products/${import("../types.d").ResourceId}/${string}` | `categories/${import("../types.d").ResourceId}/${string}` | `brands/${import("../types.d").ResourceId}/${string}` | `collections/${import("../types.d").ResourceId}/${string}` | `grids/${import("../types.d").ResourceId}/${string}` | `carts/${import("../types.d").ResourceId}/${string}` | `orders/${import("../types.d").ResourceId}/${string}` | `customers/${import("../types.d").ResourceId}/${string}` | `stores/${import("../types.d").ResourceId}/${string}` | `applications/${import("../types.d").ResourceId}/${string}` | `authentications/${import("../types.d").ResourceId}/${string}` | `products/${string}:${string}/${string}` | `categories/${string}:${string}/${string}` | `brands/${string}:${string}/${string}` | `collections/${string}:${string}/${string}` | `grids/${string}:${string}/${string}` | `carts/${string}:${string}/${string}` | `orders/${string}:${string}/${string}` | `customers/${string}:${string}/${string}` | `stores/${string}:${string}/${string}` | `applications/${string}:${string}/${string}` | `authentications/${string}:${string}/${string}` | `stores/me/${string}` | `authentications/me/${string}` | `slugs/${string}` | ("search/v1" | `search/v1?${string}` | "search/_els" | `search/_els?${string}`) | ("events/products" | "events/categories" | "events/brands" | "events/collections" | "events/grids" | "events/carts" | "events/orders" | "events/customers" | "events/stores" | "events/applications" | "events/authentications" | `events/products/${import("../types.d").ResourceId}` | `events/categories/${import("../types.d").ResourceId}` | `events/brands/${import("../types.d").ResourceId}` | `events/collections/${import("../types.d").ResourceId}` | `events/grids/${import("../types.d").ResourceId}` | `events/carts/${import("../types.d").ResourceId}` | `events/orders/${import("../types.d").ResourceId}` | `events/customers/${import("../types.d").ResourceId}` | `events/stores/${import("../types.d").ResourceId}` | `events/applications/${import("../types.d").ResourceId}` | `events/authentications/${import("../types.d").ResourceId}` | "events/me") | "login" | "authenticate" | "ask-auth-callback" | "check-username" | "$aggregate/products" | "$aggregate/categories" | "$aggregate/brands" | "$aggregate/collections" | "$aggregate/grids" | "$aggregate/carts" | "$aggregate/orders" | "$aggregate/customers" | "schemas/products" | "schemas/categories" | "schemas/brands" | "schemas/collections" | "schemas/grids" | "schemas/carts" | "schemas/orders" | "schemas/customers" | "schemas/stores" | "schemas/applications" | "schemas/authentications", C extends AbstractedConfig>(endpoint: E, body: RequestBody<{
     endpoint: E;
     method: 'put';
 }>, config?: C | undefined) => Promise<Response & {

package/packages/api/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/api",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce APIs client/adapter",
   "main": "lib/api.js",
   "types": "lib/api.d.ts",

package/packages/api/types.d.ts

@@ -24,7 +24,10 @@ type Resource = 'products'
 
 type ResourceId = string & { length: 24 };
 type ResourceAndId = `${Resource}/${ResourceId}`;
-type ResourceAndFind = ResourceAndId | `${Resource}/${string}:${string}`;
+type ResourceAndFind = ResourceAndId
+  | `${Resource}/${string}:${string}`
+  | 'stores/me'
+  | 'authentications/me';
 type ResourceOpQuery = Resource | `${Resource}?${string}`;
 
 type SearchOpQuery = 'search/v1'

package/packages/apps/affilate-program/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-affilate-program",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce app for simple affiliate program",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/correios/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-correios",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce app for Correios shipping calculation",
   "main": "lib/index.js",
   "exports": {

package/packages/apps/custom-payment/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-custom-payment",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce app for simple custom payment methods",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/custom-shipping/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-custom-shipping",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce app for custom shipping methods",
   "main": "lib/custom-shipping.js",
   "repository": {

package/packages/apps/datafrete/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-datafrete",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Datafrete shipping gateway ",
   "main": "lib/datafrete.js",
   "exports": {

package/packages/apps/discounts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-discounts",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce app for complex discount rules",
   "main": "lib/discounts.js",
   "repository": {

package/packages/apps/emails/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-emails",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce default transactional email app",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/fb-conversions/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-fb-conversions",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce app to send carts/orders to Facebook Conversions API",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/flash-courier/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-flash-courier",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Flash Courier",
   "main": "lib/index.js",
   "exports": {

package/packages/apps/frenet/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-frenet",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce app for Frenet shipping calculation",
   "main": "lib/frenet.js",
   "exports": {

package/packages/apps/galaxpay/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-galaxpay",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Galax Pay for recurring payments",
   "main": "lib/galaxpay.js",
   "exports": {

package/packages/apps/google-analytics/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-google-analytics",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce app to send carts/orders events to GA Measurement Protocol",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/jadlog/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-jadlog",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce  app for Jadlog shipping calculation",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/loyalty-points/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-loyalty-points",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce app to handle simple loyalty points programs",
   "main": "lib/loyalty-points.js",
   "exports": {

package/packages/apps/mandae/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-mandae",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Mandaê shipping intermediator",
   "main": "lib/index.js",
   "repository": {

package/packages/apps/melhor-envio/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-melhor-envio",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Melhor Envio",
   "main": "lib/index.js",
   "exports": {

package/packages/apps/mercadopago/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-mercadopago",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Mercado Pago",
   "main": "lib/mercadopago.js",
   "exports": {

package/packages/apps/pagarme/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-pagarme",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Pagar.me",
   "main": "lib/pagarme.js",
   "exports": {

package/packages/apps/pagarme-v5/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-pagarme-v5",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Pagar.me API v5 with recurring payments",
   "main": "lib/index.js",
   "exports": {

package/packages/apps/paghiper/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-paghiper",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce app to integrate PagHiper",
   "main": "lib/paghiper.js",
   "exports": {

package/packages/apps/pix/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-pix",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce app to integrate Pix API (Bacen)",
   "main": "lib/pix.js",
   "exports": {

package/packages/apps/tiny-erp/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-tiny-erp",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce app for Tiny ERP",
   "main": "lib/tiny-erp.js",
   "repository": {

package/packages/apps/webhooks/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-webhooks",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce app for general order webhooks",
   "main": "lib/index.js",
   "repository": {

package/packages/cli/config/firestore.rules

@@ -1,8 +1,11 @@
 rules_version = '2';
 service cloud.firestore {
   match /databases/{database}/documents {
+    match /forms/p/{form}/{document=*} {
+      allow create;
+    }
     match /{document=**} {
       allow read, write: if false;
     }
   }
-}
+}

package/packages/cli/lib/cli.js

@@ -1,8 +1,9 @@
 import { fileURLToPath } from 'node:url';
-import path from 'node:path';
+import { join as joinPath } from 'node:path';
 import {
   $, argv, fs, echo, chalk,
 } from 'zx';
+import Deepmerge from '@fastify/deepmerge';
 import login from './login.js';
 import build, { prepareCodebases } from './build.js';
 import { siginGcloudAndSetIAM, createServiceAccountKey } from './setup-gcloud.js';
@@ -15,13 +16,13 @@ const __dirname = fileURLToPath(new URL('.', import.meta.url));
 const pwd = process.cwd();
 let projectId = FIREBASE_PROJECT_ID;
 if (projectId) {
-  if (!fs.existsSync(path.join(pwd, '.firebaserc'))) {
-    fs.writeFileSync(path.join(pwd, '.firebaserc'), JSON.stringify({ projects: { default: projectId } }, null, 2));
+  if (!fs.existsSync(joinPath(pwd, '.firebaserc'))) {
+    fs.writeFileSync(joinPath(pwd, '.firebaserc'), JSON.stringify({ projects: { default: projectId } }, null, 2));
   }
 } else {
   if (GOOGLE_APPLICATION_CREDENTIALS) {
     try {
-      const gac = fs.readJSONSync(path.join(pwd, GOOGLE_APPLICATION_CREDENTIALS));
+      const gac = fs.readJSONSync(joinPath(pwd, GOOGLE_APPLICATION_CREDENTIALS));
       projectId = gac.project_id;
     } catch (e) {
       //
@@ -29,7 +30,7 @@ if (projectId) {
   }
   if (!projectId) {
     try {
-      const firebaserc = fs.readJSONSync(path.join(pwd, '.firebaserc'));
+      const firebaserc = fs.readJSONSync(joinPath(pwd, '.firebaserc'));
       projectId = firebaserc.projects.default;
     } catch (e) {
       projectId = 'ecom2-demo';
@@ -38,7 +39,27 @@ if (projectId) {
 }
 
 export default async () => {
-  await fs.copy(path.join(__dirname, '..', 'config'), pwd);
+  const baseConfigDir = joinPath(__dirname, '..', 'config');
+  await fs.copy(baseConfigDir, pwd);
+  const userConfigDir = joinPath(pwd, 'conf');
+  if (fs.existsSync(userConfigDir) && fs.lstatSync(userConfigDir).isDirectory()) {
+    await fs.copy(userConfigDir, pwd);
+    const userFirebaseJsonPath = joinPath(userConfigDir, 'firebase.json');
+    if (fs.existsSync(userFirebaseJsonPath)) {
+      let userFirebaseConfig;
+      try {
+        userFirebaseConfig = JSON.parse(fs.readFileSync(userFirebaseJsonPath, 'utf8'));
+      } catch {
+        //
+      }
+      if (userFirebaseConfig) {
+        const deepmerge = Deepmerge();
+        const baseFirebaseConfig = JSON.parse(fs.readFileSync(joinPath(baseConfigDir, 'firebase.json'), 'utf8'));
+        const mergedConfig = deepmerge(baseFirebaseConfig, userFirebaseConfig);
+        fs.writeFileSync(joinPath(pwd, 'firebase.json'), JSON.stringify(mergedConfig, null, 2));
+      }
+    }
+  }
   const options = [];
   Object.keys(argv).forEach((key) => {
     if (key !== '_' && argv[key] !== false) {
@@ -86,7 +107,7 @@ ${chalk.bold('npx kill-port 4000 9099 5001 8080 5000 8085 9199 4400 4500')}
   }
   if (argv._.includes('setup')) {
     const { storeId, authenticationId, apiKey } = await login();
-    await fs.writeFile(path.join(pwd, 'functions', '.env'), `ECOM_AUTHENTICATION_ID=${authenticationId}
+    await fs.writeFile(joinPath(pwd, 'functions', '.env'), `ECOM_AUTHENTICATION_ID=${authenticationId}
 ECOM_API_KEY=${apiKey}
 ECOM_STORE_ID=${storeId}
 `);
@@ -94,7 +115,7 @@ ECOM_STORE_ID=${storeId}
       await $firebase('deploy');
     }
     if (argv.commit !== false) {
-      await fs.writeFile(path.join(pwd, 'functions', 'config.json'), JSON.stringify({ storeId }, null, 2));
+      await fs.writeFile(joinPath(pwd, 'functions', 'config.json'), JSON.stringify({ storeId }, null, 2));
       await build(argv.codebase);
       try {
         await $`git add .firebaserc functions/config.json`;
@@ -150,7 +171,7 @@ Finish by saving the following secrets to your GitHub repository:
   }
   if (argv._.includes('dev') || !argv._.length) {
     await prepareCodebases(true);
-    const prefix = path.join(pwd, 'functions/ssr');
+    const prefix = joinPath(pwd, 'functions/ssr');
     // https://docs.astro.build/en/reference/cli-reference/#astro-dev
     const host = typeof argv.host === 'string' ? argv.host : '';
     const port = typeof argv.port === 'string' || typeof argv.port === 'number' ? argv.port : '';

package/packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/cli",
   "type": "module",
-  "version": "0.37.1",
+  "version": "0.38.0",
   "description": "E-Com Plus Cloud Commerce CLI tools",
   "bin": {
     "cloudcommerce": "./bin/run.mjs"
@@ -27,6 +27,7 @@
   },
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
+    "@fastify/deepmerge": "^1.3.0",
     "libsodium-wrappers": "^0.7.13",
     "md5": "^2.3.0",
     "typescript": "~5.2.2",