Switched --public override from main config to hosting/prepare.js

firebase · Oct 14, 2015 · 98ba539 · 98ba539
1 parent 3a3706a
commit 98ba539
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/lib/config.js b/lib/config.js
@@ -38,10 +38,6 @@ var Config = function(src, options) {
       }
     }, this);
   }
-
-  if (options.public) {
-    _.set(this.data, 'hosting.public', options.public);
-  }
 };
 
 Config.FILENAME = 'firebase.json';
@@ -85,6 +81,10 @@ Config.prototype.get = function(key, fallback) {
   return _.get(this.data, key, fallback);
 };
 
+Config.prototype.set = function(key, value) {
+  return _.set(this.data, key, value);
+};
+
 Config.prototype.has = function(key) {
   return _.has(this.data, key);
 };

diff --git a/lib/deploy/hosting/prepare.js b/lib/deploy/hosting/prepare.js
@@ -12,7 +12,13 @@ module.exports = function(context, options, payload) {
   };
   context.hosting.versionId = context.hosting.versionRef.key();
 
+  // Allow the public directory to be overridden by the --public flag
+  if (options.public) {
+    options.config.set('hosting.public', options.public);
+  }
+
   payload.hosting = options.config.get('hosting');
+
   if (!_.has(payload, 'hosting.public')) {
     return utils.reject('No public directory specified, can\'t deploy hosting', {exit: 1});
   } else if (!fs.existsSync(resolveProjectPath(options.cwd, payload.hosting.public))) {