Fixed all remaining team features

src/providers/sh/commands/teams.js

@@ -141,7 +141,7 @@ async function run({ token, config }) {
     case 'ls': {
       await list({
         teams,
-        token
+        config
       })
       break
     }
@@ -164,7 +164,7 @@ async function run({ token, config }) {
       await invite({
         teams,
         args,
-        token
+        config
       })
       break
     }

src/providers/sh/commands/teams/add.js

@@ -15,16 +15,16 @@ const note = require('../../../../util/output/note')
 const uid = require('../../../../util/output/uid')
 const textInput = require('../../../../util/input/text')
 const exit = require('../../../../util/exit')
-const cfg = require('../../util/cfg')
 const invite = require('./invite')
+const {writeToConfigFile} = require('../../../../util/config-files')
 
-function validateSlugKeypress(data, value) {
+const validateSlugKeypress = (data, value) => {
   // TODO: the `value` here should contain the current value + the keypress
   // should be fixed on utils/input/text.js
   return /^[a-zA-Z]+[a-zA-Z0-9_-]*$/.test(value + data)
 }
 
-function gracefulExit() {
+const gracefulExit = () => {
   console.log() // Blank line
   note(
     `Your team is now active for all ${cmd('now')} commands!\n  Run ${cmd(
@@ -37,7 +37,7 @@ function gracefulExit() {
 const teamUrlPrefix = rightPad('Team URL', 14) + chalk.gray('zeit.co/')
 const teamNamePrefix = rightPad('Team Name', 14)
 
-module.exports = async function({ teams, token }) {
+module.exports = async function({ teams, config }) {
   let slug
   let team
   let elapsed
@@ -118,13 +118,18 @@ module.exports = async function({ teams, token }) {
   console.log(chalk.cyan(`${tick} `) + teamNamePrefix + team.name + '\n')
 
   stopSpinner = wait('Saving')
-  await cfg.merge({ currentTeam: team })
+
+  // Update config file
+  const configCopy = Object.assign({}, config)
+  configCopy.sh.currentTeam = team
+  writeToConfigFile(configCopy)
+
   stopSpinner()
 
   await invite({
     teams,
     args: [],
-    token,
+    config,
     introMsg:
       'Invite your team mates! When done, press enter on an empty field',
     noopMsg: `You can invite team mates later by running ${cmd(

src/providers/sh/commands/teams/invite.js

@@ -4,7 +4,6 @@ const chalk = require('chalk')
 // Utilities
 const regexes = require('../../../../util/input/regexes')
 const wait = require('../../../../util/output/wait')
-const cfg = require('../../util/cfg')
 const fatalError = require('../../../../util/fatal-error')
 const cmd = require('../../../../util/output/cmd')
 const info = require('../../../../util/output/info')
@@ -17,7 +16,7 @@ const eraseLines = require('../../../../util/output/erase-lines')
 const success = require('../../../../util/output/success')
 const error = require('../../../../util/output/error')
 
-function validateEmail(data) {
+const validateEmail = data => {
   return regexes.email.test(data.trim()) || data.length === 0
 }
 
@@ -38,7 +37,7 @@ const domains = Array.from(
   ])
 )
 
-function emailAutoComplete(value, teamSlug) {
+const emailAutoComplete = (value, teamSlug) => {
   const parts = value.split('@')
 
   if (parts.length === 2 && parts[1].length > 0) {
@@ -61,9 +60,9 @@ function emailAutoComplete(value, teamSlug) {
 }
 
 module.exports = async function(
-  { teams, args, token, introMsg, noopMsg = 'No changes made' } = {}
+  { teams, args, config, introMsg, noopMsg = 'No changes made' } = {}
 ) {
-  const { user, currentTeam } = await cfg.read({ token })
+  const { user, currentTeam } = config.sh
 
   domains.push(user.email.split('@')[1])
 

src/providers/sh/commands/teams/list.js

@@ -3,17 +3,17 @@ const chalk = require('chalk')
 
 // Utilities
 const wait = require('../../../../util/output/wait')
-const cfg = require('../../util/cfg')
 const info = require('../../../../util/output/info')
 const error = require('../../../../util/output/error')
 const { tick: tickChar } = require('../../../../util/output/chars')
 const table = require('../../../../util/output/table')
 
-module.exports = async function({ teams, token }) {
+module.exports = async function({ teams, config }) {
   const stopSpinner = wait('Fetching teams')
   const list = (await teams.ls()).teams
-  let { user, currentTeam } = await cfg.read({ token })
+  let { user, currentTeam } = config.sh
   const accountIsCurrent = !currentTeam
+
   stopSpinner()
 
   if (accountIsCurrent) {