Merge remote-tracking branch 'origin/master'

Author: EddyVerbruggen

README.md

@@ -306,7 +306,9 @@ Note: if you currently have the `storageBucket` property in the `firebase.init()
 ### Build
 The build hooks of this plugin will now choose either the `dev` or the `prod` version of your google services `plist` and `json` files depending on how you run your build:
 
-* `prod` will be selected if you run with either the `--release`, `--env.prod` or `--env.production` flags
-* `dev` will be selected if you do not run with any of the above flags
+* `dev` will be selected if you run with either `--env.dev`, `--env.development` or `--env.staging` flags.
+* `prod` will be selected if you run with either `--env.prod` or `--env.production`.
+
+Note: Using the `--release` flag without any of the above flags will set the default environment to production. If you need to create a release with dev environment you'll need to set it explicitly.
 
 Note: if you do not have both `dev` and `prod` files in place, the regular `GoogleService-Info.plist` and `google-services.json` files will be used.

publish/scripts/installer.js

@@ -825,18 +825,24 @@ module.exports = function($logger, $projectData, hookArgs) {
 return new Promise(function(resolve, reject) {
 
         /* Decide whether to prepare for dev or prod environment */
-        var isReleaseBuild = (hookArgs.appFilesUpdaterOptions || hookArgs.prepareData).release;
+        var validStagingEnvs = ["dev", "development", "staging"];
         var validProdEnvs = ['prod','production'];
         var isProdEnv = false; // building with --env.prod or --env.production flag
+        var isStagingEnv = false;
         var env = (hookArgs.platformSpecificData || hookArgs.prepareData).env;
 
         if (env) {
             Object.keys(env).forEach((key) => {
-                if (validProdEnvs.indexOf(key)>-1) { isProdEnv=true; }
+                if (validProdEnvs.indexOf(key)>-1) { 
+			isProdEnv = true;
+		}
+		if (validStagingEnvs.indexOf(key) > -1) {
+			isStagingEnv = true;
+		}
             });
         }
 
-        var buildType = isReleaseBuild || isProdEnv ? 'production' : 'development';
+        var buildType = isProdEnv && !isStagingEnv ? "production" : "development";
         const platformFromHookArgs = hookArgs && (hookArgs.platform || (hookArgs.prepareData && hookArgs.prepareData.platform));
         const platform = (platformFromHookArgs  || '').toLowerCase();
 

src/scripts/postinstall.js

@@ -3623,18 +3623,24 @@ module.exports = function($logger, $projectData, hookArgs) {
 return new Promise(function(resolve, reject) {
 
         /* Decide whether to prepare for dev or prod environment */
-        var isReleaseBuild = (hookArgs.appFilesUpdaterOptions || hookArgs.prepareData).release;
+        var validStagingEnvs = ["dev", "development", "staging"];
         var validProdEnvs = ['prod','production'];
         var isProdEnv = false; // building with --env.prod or --env.production flag
+	var isStagingEnv = false;
         var env = (hookArgs.platformSpecificData || hookArgs.prepareData).env;
 
         if (env) {
             Object.keys(env).forEach((key) => {
-                if (validProdEnvs.indexOf(key)>-1) { isProdEnv=true; }
+                if (validProdEnvs.indexOf(key)>-1) {
+			isProdEnv=true;
+		}
+		if (validStagingEnvs.indexOf(key) > -1) {
+			isStagingEnv = true;
+		}
             });
         }
 
-        var buildType = isReleaseBuild || isProdEnv ? 'production' : 'development';
+        var buildType = isProdEnv && !isStagingEnv ? "production" : "development";
         const platformFromHookArgs = hookArgs && (hookArgs.platform || (hookArgs.prepareData && hookArgs.prepareData.platform));
         const platform = (platformFromHookArgs  || '').toLowerCase();
 
@@ -3952,4 +3958,4 @@ function isPresent(value) {
 
 
 /***/ })
-/******/ ]);
+/******/ ]);