backend-manager 3.2.119 → 3.2.121

package/package.json

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

package/src/cli/cli.js

@@ -419,6 +419,23 @@ Main.prototype.setup = async function () {
     return !!pass;
   }, fix_runtimeConfig);
 
+  // await self.test('using proper env', async function () {
+  //   let runtimeconfig = JSON.parse(jetpack.read(`${self.firebaseProjectPath}/functions/.runtimeconfig.json`) || '{}');
+  //   let ogPaths = getObjectPaths(runtimeconfigTemplate).split('\n');
+  //   let pass = true;
+
+  //   for (var i = 0, l = ogPaths.length; i < l; i++) {
+  //     let item = ogPaths[i];
+  //     if (!item) {continue}
+  //     pass = _.get(runtimeconfig, item, undefined);
+  //     if (typeof pass === 'undefined') {
+  //       break;
+  //     }
+  //   }
+
+  //   return !!pass;
+  // }, fix_runtimeConfig);
+
   await self.test('using proper backend-manager-config.json', async function () {
     const bemConfig = JSON.parse(self.bemConfigJSON);
 

package/src/manager/index.js

@@ -31,6 +31,7 @@ function Manager(exporter, options) {
   // Setup EventEmitter
   EventEmitter.call(self);
 
+  // Return
   return self;
 }
 
@@ -97,8 +98,11 @@ Manager.prototype.init = function (exporter, options) {
 
   // Load config
   self.config = merge(
+    // Load basic config
     requireJSON5(self.project.backendManagerConfigPath),
-    manuallyLoadRuntimeConfig(self.cwd),
+    // Load ENV config as a fallback
+    requireJSON5(path.resolve(self.cwd, '.runtimeconfig.json'), false),
+    // Finally, load the functions config
     self.libraries.functions
       ? self.libraries.functions.config()
       : {},
@@ -980,22 +984,18 @@ function resolveProjectPackage() {
   } catch (e) {}
 }
 
-function requireJSON5(p) {
-  try {
-    return JSON5.parse(jetpack.read(p))
-  } catch (e) {
-    console.error(`Failed to load JSON at ${p}:`, e)
-    throw e;
-  }
-}
+function requireJSON5(file, log) {
+  // Set log
+  log = typeof log === 'undefined' ? true : log;
 
-function manuallyLoadRuntimeConfig(cwd) {
+  // Load JSON5
   try {
-    console.log('=====+++', jetpack.list(cwd));
-    console.log('=====+++', require(path.resolve(cwd, '.runtimeconfig.json')));
-    return require(path.resolve(cwd, '.runtimeconfig.json'));
+    return JSON5.parse(jetpack.read(file))
   } catch (e) {
-    return {};
+    if (log) {
+      console.error(`Failed to load JSON at ${file}:`, e);
+    }
+    throw e;
   }
 }