secure cookie error crash (#2685)

- fixes #1264 
- fixes #1321 
- fixes #1799  
- fixes #2689
- fixes #2688
- fixes #2687 	
- fixes #2686

cli/scripts/build.js

@@ -51,7 +51,8 @@ function makeUserPackageFile () {
   .then((json) => {
     return fs.outputJsonAsync(packageJsonDest, json, {
       spaces: 2,
-    }).then(() => json) // returning package json object makes it easy to test
+    })
+    .return(json) // returning package json object makes it easy to test
   })
 }