🎨 improve code structure

functions/.eslintrc.json → .eslintrc.json

@@ -3,6 +3,7 @@
     // Required for certain syntax usages
     "ecmaVersion": 6
   },
+  "parser": "babel-eslint",
   "plugins": [
     "promise"
   ],

.nvmrc

@@ -0,0 +1 @@
+8

firebase.json

@@ -8,7 +8,7 @@
   },
   "functions": {
     "predeploy": [
-      "npm --prefix \"$RESOURCE_DIR\" run lint"
+      "yarn lint"
     ],
     "source": "functions"
   },

functions/package.json

@@ -2,31 +2,24 @@
   "name": "functions",
   "description": "Cloud Functions for Firebase",
   "scripts": {
-    "deploy:db": "yarn build:db:rules; firebase deploy --only database",
+    "deploy:db": "cd .. yarn build:db:rules; cd functions; firebase deploy --only database",
     "deploy:fs": "firebase deploy --only firestore",
     "logs": "firebase functions:log",
-    "lint": "./node_modules/.bin/eslint src",
     "clean": "rm index.js; rm -rf lib",
     "serve": "firebase serve --only functions",
     "start": "firebase experimental:functions:shell",
     "get:indexes": "firebase firestore:indexes > ../rules/firestore.indexes.json",
-    "build": "babel src/index.js -o index.js; babel src/lib -d lib",
-    "build:db:rules": "firebase-bolt ../rules/database.rules.bolt",
-    "deploy:functions": "yarn build; firebase deploy --only functions",
+    "deploy:functions": "cd ..;yarn build;cd functions;firebase deploy --only functions",
     "deploy:storage": "firebase deploy --only storage",
-    "deploy": "yarn build:db:rules; yarn build; firebase deploy --except hosting"
+    "deploy": "cd ..;yarn build:db:rules;yarn build;cd functions;firebase deploy --except hosting",
+    "lint": "cd ..; yarn lint"
+
   },
   "dependencies": {
     "firebase-admin": "~6.0.0",
     "firebase-functions": "^2.1.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.2.3",
-    "@babel/core": "^7.2.2",
-    "@babel/preset-env": "^7.2.3",
-    "babel-eslint": "^10.0.1",
-    "eslint": "^5.12.1",
-    "eslint-plugin-promise": "^4.0.1",
     "firebase-bolt": "^0.8.4"
   },
   "private": true

package.json

@@ -3,11 +3,23 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
+    "build": "babel src/index.js -o functions/index.js; babel src/lib -d functions/lib",
+    "build:db:rules": "firebase-bolt rules/database.rules.bolt",
     "deploy": "yarn deploy:server",
     "deploy:db": "cd functions; yarn deploy:db",
     "deploy:fs": "cd functions; yarn deploy:fs",
     "deploy:storage": "cd functions; yarn deploy:storage",
     "deploy:functions": "cd functions; yarn deploy:functions",
-    "deploy:server": "cd functions; yarn deploy"
+    "deploy:server": "cd functions; yarn deploy",
+    "lint": "npx eslint src"
+  },
+  "devDependencies": {
+    "@babel/cli": "^7.2.3",
+    "@babel/core": "^7.2.2",
+    "@babel/preset-env": "^7.2.3",
+    "babel-eslint": "^10.0.1",
+    "eslint": "^5.12.1",
+    "eslint-plugin-promise": "^4.0.1",
+    "firebase-bolt": "^0.8.4"
   }
 }