backend-manager 2.0.5 → 2.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "2.0.5",
+  "version": "2.0.8",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {

package/src/cli/cli.js

@@ -241,6 +241,11 @@ Main.prototype.setup = async function () {
   this.projectUrl = `https://console.firebase.google.com/project/${this.projectName}`;
   log(chalk.black(`Id: `, chalk.bold(`${this.projectName}`)));
   log(chalk.black(`Url:`, chalk.bold(`${this.projectUrl}`)));
+
+  if (!self.package || !self.package.engines || !self.package.engines.node) {
+    throw new Error('Missing <engines.node> in package.json')
+  }
+
   await this.test('is a firebase project', async function () {
     let exists = fs.exists(`${self.firebaseProjectPath}/firebase.json`);
     return exists;
@@ -263,17 +268,17 @@ Main.prototype.setup = async function () {
     return self.package.engines.node.toString() === CLI_CONFIG.node && processMajor >= engineMajor;
   }, fix_nodeVersion);
 
-  await this.test('project level package.json exists', async function () {
-    return !!(self.projectPackage && self.projectPackage.version && self.projectPackage.name);
-  }, fix_projpackage);
+  // await this.test('project level package.json exists', async function () {
+  //   return !!(self.projectPackage && self.projectPackage.version && self.projectPackage.name);
+  // }, fix_projpackage);
 
   await this.test('functions level package.json exists', async function () {
-    return !!self.package.dependencies && !!self.package.devDependencies;
-  }, fix_deps);
+    return !!self.package && !!self.package.dependencies && !!self.package.devDependencies && !!self.package.version;
+  }, fix_functionspackage);
 
-  await this.test('functions level package.json has updated version', async function () {
-    return self.package.version === self.projectPackage.version;
-  }, fix_packageversion);
+  // await this.test('functions level package.json has updated version', async function () {
+  //   return self.package.version === self.projectPackage.version;
+  // }, fix_packageversion);
 
   await this.test('using updated firebase-admin', async function () {
     let pkg = 'firebase-admin';
@@ -656,7 +661,7 @@ async function fix_serviceAccount(self) {
 
 function fix_nodeVersion(self) {
   return new Promise(function(resolve, reject) {
-    _.set(self.package, 'engines.node', '12')
+    _.set(self.package, 'engines.node', CLI_CONFIG.node)
 
     fs.write(`${self.firebaseProjectPath}/functions/package.json`, JSON.stringify(self.package, null, 2) );
     resolve();
@@ -690,10 +695,11 @@ function fix_projpackage(self) {
   });
 };
 
-function fix_deps(self) {
+function fix_functionspackage(self) {
   return new Promise(function(resolve, reject) {
     self.package.dependencies = self.package.dependencies || {};
     self.package.devDependencies = self.package.devDependencies || {};
+    self.package.version = self.package.version || '0.0.1';
 
     fs.write(`${self.firebaseProjectPath}/functions/package.json`, JSON.stringify(self.package, null, 2) );
     resolve();

package/src/manager/index.js

@@ -57,7 +57,7 @@ Manager.prototype.init = function (exporter, options) {
   self.options = options;
   self.project = options.firebaseConfig || JSON.parse(process.env.FIREBASE_CONFIG);
   self.cwd = process.cwd();
-  self.package = require(path.resolve(self.cwd, 'package.json'));
+  self.package = resolveProjectPackage();
   self.config = merge(
     require(path.resolve(self.cwd, 'backend-manager-config.json')),
     self.libraries.functions.config()
@@ -464,4 +464,14 @@ Manager.prototype.debug = function () {
   }
 }
 
+function resolveProjectPackage() {
+  try {
+    return require(path.resolve(process.cwd(), 'functions', 'package.json'));
+  } catch (e) {}
+
+  try {
+    return require(path.resolve(process.cwd(), 'package.json'));
+  } catch (e) {}
+}
+
 module.exports = Manager;

package/templates/gitignore.md

@@ -1,5 +1,4 @@
 # BEM>>>
 .runtimeconfig.json
 service-account*.json
-package-lock.json
 # <<<BEM