backend-manager 3.2.133 → 3.2.135

package/package.json

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

package/src/manager/index.js

@@ -14,6 +14,8 @@ const util = require('util');
 const core = './functions/core';
 const wrappers = './functions/wrappers';
 
+const BEM_CONFIG_TEMPLATE_PATH = path.resolve(__dirname, '../../templates/backend-manager-config.json');
+
 function Manager(exporter, options) {
   const self = this;
 
@@ -99,7 +101,7 @@ Manager.prototype.init = function (exporter, options) {
   // Load config
   self.config = merge(
     // Load basic config
-    requireJSON5(self.project.backendManagerConfigPath, true),
+    merge({}, requireJSON5(BEM_CONFIG_TEMPLATE_PATH, true), requireJSON5(self.project.backendManagerConfigPath, true)),
     // Load ENV config as a fallback
     requireJSON5(path.resolve(self.cwd, '.runtimeconfig.json'), options.projectType === 'firebase'),
     // Finally, load the functions config
@@ -109,7 +111,7 @@ Manager.prototype.init = function (exporter, options) {
   );
 
   // Saved config
-  const appId = get(self.config, 'app.id');
+  const appId = self.config?.app?.id;
 
   // Init assistant
   self.assistant = self.Assistant().init(undefined, options.assistant);
@@ -132,7 +134,7 @@ Manager.prototype.init = function (exporter, options) {
     const semverMajor = require('semver/functions/major')
     const semverCoerce = require('semver/functions/coerce')
     const semverUsing = semverMajor(semverCoerce(process.versions.node));
-    const semverRequired = semverMajor(semverCoerce(get(self.package, 'engines.node', '0.0.0')));
+    const semverRequired = semverMajor(semverCoerce(self.package?.engines?.node || '0.0.0'));
 
     // Fix firebase-tools overwriting console.log
     // https://stackoverflow.com/questions/56026747/firebase-console-log-on-localhost
@@ -169,7 +171,7 @@ Manager.prototype.init = function (exporter, options) {
   // Setup sentry
   if (self.options.sentry) {
     const sentryRelease = `${appId || self.project.projectId}@${self.package.version}`;
-    const sentryDSN = get(self.config, 'sentry.dsn', '');
+    const sentryDSN = self.config?.sentry?.dsn || '';
     // console.log('Sentry', sentryRelease, sentryDSN);
 
     self.libraries.sentry = require('@sentry/node');
@@ -204,7 +206,6 @@ Manager.prototype.init = function (exporter, options) {
           databaseURL: self.project.databaseURL || `https://${self.project.projectId}.firebaseio.com`,
         }, options.uniqueAppName);
 
-        // const loadedProjectId = get(self.libraries.initializedAdmin, 'options_.credential.projectId', null);
         const loadedProjectId = serviceAccount.project_id;
         if (!loadedProjectId || !loadedProjectId.includes(appId)) {
           self.assistant.error(`Loaded app may have wrong service account: ${loadedProjectId} =/= ${appId}`);