backend-manager 3.2.121 → 3.2.123

package/package.json

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

package/src/manager/index.js

@@ -99,9 +99,9 @@ Manager.prototype.init = function (exporter, options) {
   // Load config
   self.config = merge(
     // Load basic config
-    requireJSON5(self.project.backendManagerConfigPath),
+    requireJSON5(self.project.backendManagerConfigPath, true),
     // Load ENV config as a fallback
-    requireJSON5(path.resolve(self.cwd, '.runtimeconfig.json'), false),
+    requireJSON5(path.resolve(self.cwd, '.runtimeconfig.json'), options.projectType === 'firebase'),
     // Finally, load the functions config
     self.libraries.functions
       ? self.libraries.functions.config()
@@ -984,17 +984,21 @@ function resolveProjectPackage() {
   } catch (e) {}
 }
 
-function requireJSON5(file, log) {
-  // Set log
-  log = typeof log === 'undefined' ? true : log;
+function requireJSON5(file, throwError) {
+  // Set throwError
+  throwError = typeof throwError === 'undefined' ? true : throwError;
 
   // Load JSON5
   try {
     return JSON5.parse(jetpack.read(file))
   } catch (e) {
-    if (log) {
-      console.error(`Failed to load JSON at ${file}:`, e);
+    // If we're not throwing an error, just return
+    if (!throwError) {
+      return {};
     }
+
+    // Otherwise, throw the error
+    console.error(`Failed to load JSON at ${file}:`, e);
     throw e;
   }
 }