Updated workflow, updated dependencies, removed unnecessary dependencies, cleaned up CLI.

Author: coreybutler

.github/workflows/deploy.yml

@@ -0,0 +1,53 @@
+name: Tag, Release, Publish
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  publish:
+    name: Deploy
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    
+    - name: Tag
+      id: autotagger
+      uses: butlerlogic/action-autotag@stable
+      with:
+        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+    
+    - name: Pre-release
+      if: steps.autotagger.outputs.tagname != ''
+      run: |
+        if [[ "${{ steps.autotagger.output.version }}" == *"-"* ]]; then echo "::set-env IS_PRERELEASE=true";else echo "::set-env IS_PRERELEASE=''";fi
+
+    - name: Release
+      id: release
+      if: steps.autotagger.outputs.tagname != ''
+      uses: actions/create-release@v1.0.0
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ steps.autotagger.outputs.tagname }}
+        release_name: Version ${{ steps.autotagger.outputs.version }}
+        body: ${{ steps.autotagger.outputs.tagmessage }}
+        draft: false
+        prerelease: env.IS_PRERELEASE != ''
+
+    - name: Publish
+      id: publish
+      if: steps.autotagger.outputs.tagname != ''
+      uses: author/action-publish@master
+      env:
+        REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
+        ACTIONS_STEP_DEBUG: true
+
+    - name: Rollback
+      if: failure()
+      uses: author/action-rollback@stable
+      with:
+        release_id: ${{ steps.release.outputs.id }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

cli.js

@@ -29,7 +29,7 @@ switch (cmd.trim().toLowerCase()) {
 
     pkg.scripts = pkg.scripts || {}
     pkg.scripts = Object.assign(pkg.scripts, {
-      serve: 'firebase serve --only functions,database',
+      serve: 'firebase serve --only functions',
       shell: 'firebase functions:shell',
       start: 'firebase emulators:start --only functions',
       logs: 'firebase functions:log',
@@ -121,7 +121,7 @@ Object.assign(exports, FirebaseAPI.exports)
 
       if (!fs.existsSync(path.join(apiPath, 'routes.js'))) {
         fs.writeFileSync(path.join(apiPath, 'routes.js'), `const express = require('express')
-const API = require('@butlerlogic/firebase-api').API // Reference to @ecor/common-api module.
+const API = require('@butlerlogic/common-api')
 const app = express()
 
 API.applySimpleCORS(app)

index.js

@@ -12,12 +12,12 @@ class API {
           let content = require(process.env.GOOGLE_APPLICATION_CREDENTIALS)
 
           if (content.private_key.trim().indexOf('-----BEGIN PRIVATE KEY-----') !== 0) {
+            console.log(`PRIVATE KEY NOT FOUND IN ${process.env.GOOGLE_APPLICATION_CREDENTIALS}.\nFirebase admin connection may be invalid without proper credentials.\n\n`)
             delete process.env.GOOGLE_APPLICATION_CREDENTIALS
-            console.log('\n\nPRIVATE KEY NOT FOUND.\nFirebase admin connection may be invalid without proper credentials.\n\n')
           }
         } catch (e) {
+          console.log(`PRIVATE KEY NOT FOUND IN ${process.env.GOOGLE_APPLICATION_CREDENTIALS}.\nFirebase admin connection may be invalid without proper credentials.\n\n`)
           delete process.env.GOOGLE_APPLICATION_CREDENTIALS
-          console.log('\n\nPRIVATE KEY NOT FOUND.\nFirebase admin connection may be invalid without proper credentials.\n\n')
         }
       }
     }
@@ -49,10 +49,6 @@ class API {
 
     return exportable
   }
-
-  get API () {
-    return require('@ecor/common-api')
-  }
 }
 
 module.exports = new API()

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@butlerlogic/firebase-api",
-  "version": "1.0.9-beta.1",
+  "version": "1.0.9",
   "description": "A boilerplate structure for building an HTTP API using Firebase functions.",
   "main": "index.js",
   "scripts": {
@@ -30,10 +30,9 @@
   },
   "homepage": "https://github.com/ButlerLogic/firebase-api#readme",
   "dependencies": {
-    "@ecor/common-api": "^1.0.6",
-    "firebase-admin": "^8.5.0",
-    "firebase-functions": "^3.2.0",
-    "localenvironment": "^1.0.2",
-    "@butlerlogic/firebase": "^1.0.0"
+    "firebase-admin": "8.9.2",
+    "firebase-functions": "3.3.0",
+    "localenvironment": "1.1.0",
+    "@butlerlogic/firebase": "1.0.1"
   }
 }