cloudcommerce 0.0.18 → 0.0.21

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 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.0.21](https://github.com/ecomplus/cloud-commerce/compare/v0.0.20...v0.0.21) (2022-07-09)
+
+
+### Bug Fixes
+
+* **deps:** Update dependency firebase-admin to v11 ([#27](https://github.com/ecomplus/cloud-commerce/issues/27)) ([a258b84](https://github.com/ecomplus/cloud-commerce/commit/a258b84cb26415063b7807a42b8eb937d2ff8452))
+* **gh-action:** Checks `github.event_name` instead of branch to decide live or preview ([b0affe6](https://github.com/ecomplus/cloud-commerce/commit/b0affe6069e23bc57b4b9ce5ff86992430f0f52e))
+
+### [0.0.20](https://github.com/ecomplus/cloud-commerce/compare/v0.0.19...v0.0.20) (2022-06-29)
+
+### [0.0.19](https://github.com/ecomplus/cloud-commerce/compare/v0.0.18...v0.0.19) (2022-06-29)
+
+
+### Features
+
+* **cli:** Copy Firebase config files before running command ([210d9d5](https://github.com/ecomplus/cloud-commerce/commit/210d9d52c1e1fb1b61d5716382e325b96aaf5f67))
+
 ### [0.0.18](https://github.com/ecomplus/cloud-commerce/compare/v0.0.17...v0.0.18) (2022-06-29)
 
 ### [0.0.17](https://github.com/ecomplus/cloud-commerce/compare/v0.0.16...v0.0.17) (2022-06-29)

package/action.yml

@@ -14,24 +14,20 @@ outputs: {}
 runs:
   using: "composite"
   steps:
-    - name: Get current branch
-      id: get-branch
-      env:
-        GITHUB_REF: ${{ github.ref }}
-        run: echo "::set-output name=name::${GITHUB_REF#refs/heads/}"
-
-    - if: steps.get-branch.outputs.name == main
+    - if: github.event_name == 'push'
       uses: actions/setup-node@v3
       with:
         node-version: 16
         cache: 'npm'
-        # cache-dependency-path: ${{ github.action_path }}/scripts/store/package-lock.json
 
-    - if: steps.get-branch.outputs.name == main
+    - if: github.event_name == 'push'
       shell: bash
-      run: npm i -g firebase-tools
+      run: npm i -g firebase-tools && npm ci
+    
+    - shell: bash
+      run: npm run build
 
-    - if: steps.get-branch.outputs.name == main
+    - if: github.event_name == 'push'
       name: Deploy to Firebase live
       shell: bash
       env:
@@ -39,9 +35,9 @@ runs:
       run: |
         export GAC_FILENAME=".gac-$RANDOM.json";
         echo $FIREBASE_SERVICE_ACCOUNT > $GAC_FILENAME;
-        GOOGLE_APPLICATION_CREDENTIALS=$GAC_FILENAME npx firebase deploy;
+        GOOGLE_APPLICATION_CREDENTIALS=$GAC_FILENAME npm run deploy;
     
-    - if: steps.get-branch.outputs.name != main
+    - if: github.event_name == 'pull_request'
       name: Deploy Firebase Hosting PR preview
       uses: FirebaseExtended/action-hosting-deploy@v0
       with:

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloudcommerce",
   "type": "module",
-  "version": "0.0.18",
+  "version": "0.0.21",
   "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,22 +19,22 @@
     "@commitlint/cli": "^17.0.3",
     "@commitlint/config-conventional": "^17.0.3",
     "@commitlint/rules": "^17.0.0",
-    "@types/node": "^17.0.45",
-    "@typescript-eslint/eslint-plugin": "^5.30.0",
-    "@typescript-eslint/parser": "^5.30.0",
-    "esbuild": "^0.14.47",
-    "eslint": "^8.18.0",
+    "@types/node": "^18.0.3",
+    "@typescript-eslint/eslint-plugin": "^5.30.5",
+    "@typescript-eslint/parser": "^5.30.5",
+    "esbuild": "^0.14.48",
+    "eslint": "^8.19.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-vue": "^9.1.1",
+    "eslint-plugin-vue": "^9.2.0",
     "husky": "^8.0.1",
     "node-fetch": "^3.2.6",
     "standard-version": "^9.5.0",
     "turbo": "^1.3.1",
     "typescript": "^4.7.4",
-    "vite": "^2.9.13",
-    "vitest": "^0.15.2",
-    "zx": "^7.0.3"
+    "vite": "^2.9.14",
+    "vitest": "^0.17.1",
+    "zx": "^7.0.7"
   },
   "scripts": {
     "postinstall": "husky install",

package/packages/api/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/api",
   "type": "module",
-  "version": "0.0.18",
+  "version": "0.0.21",
   "description": "E-Com Plus Cloud Commerce APIs client/adapter",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -17,7 +17,7 @@
   },
   "homepage": "https://github.com/ecomplus/cloud-commerce/tree/main/packages/api#readme",
   "scripts": {
-    "build": "sh scripts/build.sh",
+    "build": "sh ../../scripts/build-lib.sh && cp -r src/types lib/",
     "test": "tsc -p ../../tsconfig.test.json && vitest run"
   }
 }

package/packages/apps/discounts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/app-discounts",
   "type": "module",
-  "version": "0.0.18",
+  "version": "0.0.21",
   "description": "E-Com Plus Cloud Commerce app for complex discount rules",
   "main": "functions/dist/index.js",
   "repository": {

package/packages/cli/bin/run.mjs

@@ -1,26 +1,4 @@
 #!/usr/bin/env node
-import { $, argv } from 'zx';
+import run from '../lib/index.js';
 
-(async () => {
-  const options = Object.keys(argv).reduce((opts, key) => {
-    if (key !== '_') {
-      // eslint-disable-next-line no-param-reassign
-      opts += `--${key} ${argv[key]}\n`;
-    }
-    return opts;
-  }, '');
-  const $firebase = async (cmd) => $`npx firebase-tools ${cmd} ${options}`;
-  if (argv._.includes('serve')) {
-    return $firebase('emulators:start');
-  }
-  if (argv._.find((cmd) => /^(\w+:)?(shell|start)$/.test(cmd))) {
-    return $firebase('functions:shell');
-  }
-  if (argv._.find((cmd) => /^(\w+:)?logs?$/.test(cmd))) {
-    return $firebase('functions:log');
-  }
-  if (argv._.includes('deploy')) {
-    return $firebase('deploy');
-  }
-  return $`echo 'Hello from @cloudcommerce/cli'`;
-})();
+run();

package/packages/cli/config/firebase.json

@@ -0,0 +1,47 @@
+{
+  "firestore": {
+    "rules": "firestore.rules",
+    "indexes": "firestore.indexes.json"
+  },
+  "functions": {
+    "predeploy": "npm --prefix \"$RESOURCE_DIR\" run build",
+    "source": "functions"
+  },
+  "hosting": {
+    "public": "public",
+    "ignore": [
+      "firebase.json",
+      "**/.*",
+      "**/node_modules/**"
+    ]
+  },
+  "storage": {
+    "rules": "storage.rules"
+  },
+  "emulators": {
+    "auth": {
+      "port": 9099
+    },
+    "functions": {
+      "port": 5001
+    },
+    "firestore": {
+      "port": 8080
+    },
+    "hosting": {
+      "port": 5000
+    },
+    "pubsub": {
+      "port": 8085
+    },
+    "storage": {
+      "port": 9199
+    },
+    "ui": {
+      "enabled": true
+    }
+  },
+  "remoteconfig": {
+    "template": "remoteconfig.template.json"
+  }
+}

package/packages/cli/config/firestore.indexes.json

@@ -0,0 +1,4 @@
+{
+  "indexes": [],
+  "fieldOverrides": []
+}

package/packages/cli/config/firestore.rules

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

package/packages/cli/config/remoteconfig.template.json

@@ -0,0 +1 @@
+{}

package/packages/cli/config/storage.rules

@@ -0,0 +1,15 @@
+rules_version = '2';
+service firebase.storage {
+  match /b/{bucket}/o {
+    match /public/{allPaths=**} {
+      allow read;
+      allow write: if false;
+    }
+    match /usr/{userId}/{allPaths=**} {
+      allow read, write: if request.auth != null && request.auth.uid == userId;
+    }
+    match /{allPaths=**} {
+      allow read, write: if false;
+    }
+  }
+}

package/packages/cli/lib/index.js

@@ -0,0 +1,31 @@
+import url from 'url';
+import path from 'path';
+import { $, argv, fs } from 'zx';
+
+const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
+const pwd = process.cwd();
+
+export default async () => {
+  fs.copySync(path.join(__dirname, '..', 'config'), pwd);
+  const options = Object.keys(argv).reduce((opts, key) => {
+    if (key !== '_') {
+      // eslint-disable-next-line no-param-reassign
+      opts += ` --${key} ${argv[key]}`;
+    }
+    return opts;
+  }, '');
+  const $firebase = async (cmd) => $`npx firebase-tools ${cmd}${options}`;
+  if (argv._.includes('serve')) {
+    return $firebase('emulators:start');
+  }
+  if (argv._.find((cmd) => /^(\w+:)?(shell|start)$/.test(cmd))) {
+    return $firebase('functions:shell');
+  }
+  if (argv._.find((cmd) => /^(\w+:)?logs?$/.test(cmd))) {
+    return $firebase('functions:log');
+  }
+  if (argv._.includes('deploy')) {
+    return $firebase('deploy');
+  }
+  return $`echo 'Hello from @cloudcommerce/cli'`;
+};

package/packages/cli/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@cloudcommerce/cli",
   "type": "module",
-  "version": "0.0.18",
+  "version": "0.0.21",
   "description": "E-Com Plus Cloud Commerce CLI tools",
   "bin": {
     "cloudcommerce": "./bin/run.mjs"
   },
+  "main": "lib/index.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ecomplus/cloud-commerce.git",
@@ -17,7 +18,10 @@
     "url": "https://github.com/ecomplus/cloud-commerce/issues"
   },
   "homepage": "https://github.com/ecomplus/cloud-commerce/tree/main/packages/cli#readme",
+  "scripts": {
+    "build": "sh ../../scripts/build-lib.sh"
+  },
   "dependencies": {
-    "zx": "^7.0.3"
+    "zx": "^7.0.7"
   }
 }

package/packages/cli/src/index.ts

@@ -0,0 +1,33 @@
+import url from 'url';
+import path from 'path';
+import { $, argv, fs } from 'zx';
+
+const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
+const pwd = process.cwd();
+
+export default async () => {
+  fs.copySync(path.join(__dirname, '..', 'config'), pwd);
+
+  const options = Object.keys(argv).reduce((opts, key) => {
+    if (key !== '_') {
+      // eslint-disable-next-line no-param-reassign
+      opts += ` --${key} ${argv[key]}`;
+    }
+    return opts;
+  }, '');
+  const $firebase = async (cmd: string) => $`npx firebase-tools ${cmd}${options}`;
+
+  if (argv._.includes('serve')) {
+    return $firebase('emulators:start');
+  }
+  if (argv._.find((cmd) => /^(\w+:)?(shell|start)$/.test(cmd))) {
+    return $firebase('functions:shell');
+  }
+  if (argv._.find((cmd) => /^(\w+:)?logs?$/.test(cmd))) {
+    return $firebase('functions:log');
+  }
+  if (argv._.includes('deploy')) {
+    return $firebase('deploy');
+  }
+  return $`echo 'Hello from @cloudcommerce/cli'`;
+};

package/packages/cli/tsconfig.json

@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "sourceMap": false
+  }
+}

package/packages/firebase/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/firebase",
   "type": "module",
-  "version": "0.0.18",
+  "version": "0.0.21",
   "description": "E-Com Plus Cloud Commerce on Firebase",
   "main": "src/index.js",
   "repository": {
@@ -20,8 +20,8 @@
   },
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
-    "firebase-admin": "^10.3.0",
-    "firebase-functions": "^3.21.2"
+    "firebase-admin": "^11.0.0",
+    "firebase-functions": "^3.22.0"
   },
   "devDependencies": {
     "@firebase/app-types": "^0.7.0"

package/packages/storefront/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/storefront",
   "type": "module",
-  "version": "0.0.18",
+  "version": "0.0.21",
   "description": "E-Com Plus Cloud Commerce storefront with Astro",
   "main": "src/index.js",
   "repository": {
@@ -20,6 +20,6 @@
   },
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
-    "astro": "1.0.0-beta.46"
+    "astro": "1.0.0-beta.63"
   }
 }