backend-manager 5.0.5 → 5.0.7

package/package.json

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

package/src/manager/helpers/assistant.js

@@ -70,16 +70,7 @@ function tryUrl(self) {
           : `${protocol}://${host}/${self.meta.name}`;
       }
     } else if (projectType === 'custom') {
-      const server = Manager?._internal?.server;
-      const addy = server ? server.address() : null;
-      console.log('---TEST 1');
-      console.log('---addy', addy);
-      console.log('-------A', `${protocol}://${addy.address}:${addy.port}${path}`);
-      console.log('-------B', `${protocol}://${host}${path}`);
-
-      return addy
-        ? `${protocol}://${addy.address}:${addy.port}${path}`
-        : `${protocol}://${host}${path}`;
+      return `${protocol}://${host}${path}`;
     }
 
     return '';
@@ -643,6 +634,7 @@ BackendAssistant.prototype.authenticate = async function (options) {
       ? false
       : user.authenticated;
 
+
     // Validate BACKEND_MANAGER_KEY
     if (backendManagerKey && backendManagerKey === BACKEND_MANAGER_KEY) {
       // Update roles

package/src/manager/index.js

@@ -107,12 +107,21 @@ Manager.prototype.init = function (exporter, options) {
   // Load package.json
   self.package = resolveProjectPackage(options.projectPackageDirectory || self.cwd);
 
+  // Set dotenv
+  try {
+    const env = require('dotenv').config();
+  } catch (e) {
+    self.assistant.error(new Error(`Failed to set up environment variables from .env file: ${e.message}`));
+  }
+
   // Load config
   self.config = merge(
     // Load basic config
     merge({}, requireJSON5(BEM_CONFIG_TEMPLATE_PATH, true), requireJSON5(self.project.backendManagerConfigPath, true)),
-    // Load ENV config as a fallback
+    // Load runtimeconfig as a fallback
     requireJSON5(path.resolve(self.cwd, '.runtimeconfig.json'), options.projectType === 'firebase'),
+    // Load .ENV config because that is the new format
+    process.env.RUNTIME_CONFIG ? JSON5.parse(process.env.RUNTIME_CONFIG) : {},
     // Finally, load the functions config
     self.libraries.functions
       ? self.libraries.functions.config()
@@ -278,13 +287,6 @@ Manager.prototype.init = function (exporter, options) {
     self.setupCustomServer(exporter, options);
   }
 
-  // Set dotenv
-  try {
-    const env = require('dotenv').config();
-  } catch (e) {
-    self.assistant.error(new Error(`Failed to set up environment variables from .env file: ${e.message}`));
-  }
-
   // Setup LocalDatabase
   if (options.initializeLocalStorage) {
     self.storage();