Improve Makefile (#43)

* Improve Makefile * Bugfix * Add make target for remote machine workers * Update travis config * Debug travis * Debug travis * Debug travis * Debug travis * Debug travis * Debug travis * Debug travis * Install bash completion script

Improve Makefile (#43)
* Improve Makefile * Bugfix * Add make target for remote machine workers * Update travis config * Debug travis * Debug travis * Debug travis * Debug travis * Debug travis * Debug travis * Debug travis * Install bash completion script
c015421c · liuzhe-lz · QuanluZhang · 55f6c9e3 · c015421c · c015421c
Commit c015421c authored Sep 14, 2018 by liuzhe-lz Committed by QuanluZhang Sep 14, 2018
7 changed files
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ before_install:
  - tar xf node-v10.9.0-linux-x64.tar.xz
  - sudo mv node-v10.9.0-linux-x64 /usr/local/node
  - export PATH=/usr/local/node/bin:$PATH
+  - sudo sh -c 'PATH=/usr/local/node/bin:$PATH yarn global add serve'
 install:
  - make
  - make install
@@ -15,4 +16,4 @@ install:
 before_script:
  - cd test/naive
 script:
-  - python3 run.py
\ No newline at end of file
+  - python3 run.py
--- a/Makefile
+++ b/Makefile
-BIN_PATH ?= ${HOME}/.local/bin
-INSTALL_PREFIX ?= ${HOME}/.local
-EXAMPLES_PATH ?= ${HOME}/nni/examples
-WHOAMI := $(shell whoami)
-YARN := $(INSTALL_PREFIX)/yarn/bin/yarn
-PIP_MODE ?= --user
-ifdef VIRTUAL_ENV
-undefine PIP_MODE
+# Setting variables
+
+SHELL := /bin/bash
+
+## Install directories
+ifeq ($(shell id -u), 0)  # is root
+    _ROOT := 1
+    BIN_PATH ?= /usr/bin
+    INSTALL_PREFIX ?= /usr/share
+    EXAMPLES_PATH ?= $(INSTALL_PREFIX)/nni/examples
+    BASH_COMP_SCRIPT ?= /usr/share/bash-completion/completions/nnictl
+else  # is normal user
+    BIN_PATH ?= ${HOME}/.local/bin
+    INSTALL_PREFIX ?= ${HOME}/.local
+    EXAMPLES_PATH ?= ${HOME}/nni/examples
+    ifndef VIRTUAL_ENV
+        PIP_MODE ?= --user
+    endif
+    BASH_COMP_SCRIPT ?= ${HOME}/.bash_completion.d/nnictl
 endif
-.PHONY: build install uninstall dev-install

+## Dependency information
+NODE_VERSION ?= v10.9.0
+NODE_TARBALL ?= node-$(NODE_VERSION)-linux-x64.tar.xz
+NODE_PATH ?= $(INSTALL_PREFIX)/nni/node
+
+YARN_VERSION ?= v1.9.4
+YARN_TARBALL ?= yarn-$(YARN_VERSION).tar.gz
+YARN_PATH ?= /tmp/nni-yarn
+
+SERVE_VERSION ?= 10.0.1
+SERVE_TARBALL ?= serve-$(SERVE_VERSION).tgz
+SERVE_PATH ?= $(INSTALL_PREFIX)/nni/serve
+
+
+## Check if dependencies have been installed globally
+ifeq (, $(shell command -v node 2>/dev/null))
+    $(info Node.js not found)
+    _MISS_DEPS := 1  # node not found
+else
+    _VER := $(shell node --version)
+    _NEWER := $(shell echo -e "$(NODE_VERSION)\n$(_VER)" | sort -Vr | head -n 1)
+    ifneq ($(_VER), $(_NEWER))
+        $(info Node.js version not match)
+        _MISS_DEPS := 1  # node outdated
+    endif
+endif
+ifeq (, $(shell command -v yarnpkg 2>/dev/null))
+    $(info Yarn not found)
+    _MISS_DEPS := 1  # yarn not found
+endif
+ifeq (, $(shell command -v serve 2>/dev/null))
+    $(info Serve not found)
+    _MISS_DEPS := 1  # serve not found
+endif
+
+ifdef _MISS_DEPS
+    $(info Missing dependencies, use local toolchain)
+    NODE := $(NODE_PATH)/bin/node
+    YARN := PATH=$${PATH}:$(NODE_PATH)/bin $(YARN_PATH)/bin/yarn
+    SERVE := $(SERVE_PATH)/serve
+else
+    $(info All dependencies found, use global toolchain)
+    NODE := node
+    YARN := yarnpkg
+    SERVE := serve
+endif
+
+## Colorful output
+_INFO := $(shell echo -e '\e[1;36m')
+_WARNING := $(shell echo -e '\e[1;33m')
+_END := $(shell echo -e '\e[0m')
+
+# Setting variables end
+
+
+# Main targets
+
+.PHONY: build
 build:
-	### Building NNI Manager ###
-	cd src/nni_manager && yarn && yarn build
+	#$(_INFO) Building NNI Manager $(_END)
+	cd src/nni_manager && $(YARN) && $(YARN) build
 	
-	### Building Web UI ###
-	cd src/webui && yarn && yarn build
+	#$(_INFO) Building Web UI $(_END)
+	cd src/webui && $(YARN) && $(YARN) build
 	
-	### Building Python SDK ###
+	#$(_INFO) Building Python SDK $(_END)
 	cd src/sdk/pynni && python3 setup.py build
 	
-	### Building nnictl ###
+	#$(_INFO) Building nnictl $(_END)
 	cd tools && python3 setup.py build


+# Standard installation target
+# Must be invoked after building
+.PHONY: install
+install: install-python-modules
+install: install-node-modules
+install: install-scripts
+install: install-examples
 install:
-    ifneq ('$(HOME)', '/root')
-        ifeq (${WHOAMI}, root)
-			### Sorry, sudo make install is not supported ###
-			exit 1
-        endif
-    endif
+	#$(_INFO) Complete! You may want to add $(BIN_PATH) to your PATH environment $(_END)

-	mkdir -p $(BIN_PATH)
-	mkdir -p $(INSTALL_PREFIX)/nni
-	mkdir -p $(EXAMPLES_PATH)
-	
-	### Installing NNI Manager ###
-	cp -rT src/nni_manager/dist $(INSTALL_PREFIX)/nni/nni_manager
-	cp -rT src/nni_manager/node_modules $(INSTALL_PREFIX)/nni/nni_manager/node_modules
-	
-	### Installing Web UI ###
-	cp -rT src/webui/build $(INSTALL_PREFIX)/nni/webui
-	ln -sf $(INSTALL_PREFIX)/nni/nni_manager/node_modules/serve/bin/serve.js $(BIN_PATH)/serve
-	
-	### Installing Python SDK dependencies ###
-	pip3 install $(PIP_MODE) -r src/sdk/pynni/requirements.txt
-	### Installing Python SDK ###
+
+# Target for remote machine workers
+# Only installs core SDK module
+.PHONY: remote-machine-install
+remote-machine-install:
 	cd src/sdk/pynni && python3 setup.py install $(PIP_MODE)
+
+
+# All-in-one target
+# Installs NNI as well as its dependencies, and update bashrc to set PATH
+.PHONY: easy-install
+easy-install: check-perm
+easy-install: install-dependencies
+easy-install: build
+easy-install: install-python-modules
+easy-install: install-node-modules
+easy-install: install-scripts
+easy-install: install-examples
+easy-install: update-bashrc
+easy-install:
+	#$(_INFO) Complete! #(_END)
+
+
+# Target for setup.py
+# Do not invoke this manually
+.PHONY: pip-install
+pip-install: install-dependencies
+pip-install: build
+pip-install: install-node-modules
+pip-install: install-scripts
+pip-install: install-examples
+
+
+# Target for NNI developers
+# Creates symlinks instead of copying files
+.PHONY: dev-install
+dev-install: check-dev-env
+dev-install: install-dev-modules
+dev-install: install-scripts
+dev-install:
+	#$(_INFO) Complete! You may want to add $(BIN_PATH) to your PATH environment $(_END)
+
+
+.PHONY: uninstall
+uninstall:
+	-pip3 uninstall -y nni
+	-pip3 uninstall -y nnictl
+	-rm -rf $(INSTALL_PREFIX)/nni
+	-rm -f $(BIN_PATH)/nnimanager
+	-rm -f $(BIN_PATH)/nnictl
+	-rm -f $(BASH_COMP_SCRIPT)
+	-[ $(EXAMPLES_PATH) = ${PWD}/examples ] || rm -rf $(EXAMPLES_PATH)
+
+# Main targets end
+
+
+# Helper targets
+
+$(NODE_TARBALL):
+	#$(_INFO) Downloading Node.js $(_END)
+	wget https://nodejs.org/dist/$(NODE_VERSION)/$(NODE_TARBALL)
+
+$(YARN_TARBALL):
+	#$(_INFO) Downloading Yarn $(_END)
+	wget https://github.com/yarnpkg/yarn/releases/download/$(YARN_VERSION)/$(YARN_TARBALL)
+
+$(SERVE_TARBALL):
+	#$(_INFO) Downloading serve $(_END)
+	wget https://registry.npmjs.org/serve/-/$(SERVE_TARBALL)
+
+.PHONY: intall-dependencies
+install-dependencies: $(NODE_TARBALL) $(YARN_TARBALL) $(SERVE_TARBALL)
+	#$(_INFO) Cleaning $(_END)
+	rm -rf $(NODE_PATH)
+	rm -rf $(YARN_PATH)
+	rm -rf $(SERVE_PATH)
+	mkdir -p $(NODE_PATH)
+	mkdir -p $(YARN_PATH)
+	mkdir -p $(SERVE_PATH)
 	
-	### Installing nnictl ###
-	cd tools && python3 setup.py install $(PIP_MODE)
+	#$(_INFO) Extracting Node.js $(_END)
+	tar -xf $(NODE_TARBALL)
+	mv -fT node-$(NODE_VERSION)-linux-x64 $(NODE_PATH)
 	
-	echo '#!/bin/sh' > $(BIN_PATH)/nnimanager
-	echo 'cd $(INSTALL_PREFIX)/nni/nni_manager && node main.js $$@' >> $(BIN_PATH)/nnimanager
-	chmod +x $(BIN_PATH)/nnimanager
+	#$(_INFO) Extracting Yarn $(_END)
+	tar -xf $(YARN_TARBALL)
+	mv -fT yarn-$(YARN_VERSION) $(YARN_PATH)
 	
-	echo '#!/bin/sh' > $(BIN_PATH)/nnictl
-	echo 'NNI_MANAGER=$(BIN_PATH)/nnimanager WEB_UI_FOLDER=$(INSTALL_PREFIX)/nni/webui python3 -m nnicmd.nnictl $$@' >> $(BIN_PATH)/nnictl
-	chmod +x $(BIN_PATH)/nnictl
+	#$(_INFO) Installing serve $(_END)
+	PATH=$${PATH}:$(NODE_PATH)/bin npm install --prefix $(SERVE_PATH) $(SERVE_TARBALL)
 	
-	### Installing examples ###
-	cp -rT examples $(EXAMPLES_PATH)
-
+	#$(_INFO) Creating serve executable script $(_END)
+	echo '#!/bin/sh' > $(SERVE_PATH)/serve
+	echo '$(NODE) $(SERVE_PATH)/node_modules/serve/bin/serve.js $$@' >> $(SERVE_PATH)/serve
+	chmod +x $(SERVE_PATH)/serve

-pip-install:
-    ifneq ('$(HOME)', '/root')
-        ifeq (${WHOAMI}, root)
-			### Sorry, sudo pip install is not supported ###
-			exit 1
-        endif
-    endif

-	### Prepare Node.js ###
-	wget https://nodejs.org/dist/v10.9.0/node-v10.9.0-linux-x64.tar.xz
-	tar xf node-v10.9.0-linux-x64.tar.xz
-	cp -rT node-v10.9.0-linux-x64 $(INSTALL_PREFIX)/node
+.PHONY: install-python-modules
+install-python-modules:
+	#$(_INFO) Installing Python SDK $(_END)
+	cd src/sdk/pynni && python3 setup.py install $(PIP_MODE)
 	
-	### Prepare Yarn 1.9.4 ###
-	wget https://github.com/yarnpkg/yarn/releases/download/v1.9.4/yarn-v1.9.4.tar.gz
-	tar xf yarn-v1.9.4.tar.gz
-	cp -rT yarn-v1.9.4 $(INSTALL_PREFIX)/yarn
+	#$(_INFO) Installing nnictl $(_END)
+	cd tools && python3 setup.py install $(PIP_MODE)

-	### Export PATH for node and yarn, and build NNI Manager ###
-	export PATH=$(INSTALL_PREFIX)/node/bin:$(INSTALL_PREFIX)/yarn/bin:$(PATH) && cd src/nni_manager && $(YARN) && $(YARN) build

-	### Building Web UI ###
-	export PATH=$(INSTALL_PREFIX)/node/bin:$(INSTALL_PREFIX)/yarn/bin:$(PATH) && cd src/webui && $(YARN) && $(YARN) build
-	
-	mkdir -p $(BIN_PATH)
+.PHONY: install-node-modules
+install-node-modules:
 	mkdir -p $(INSTALL_PREFIX)/nni
-	mkdir -p $(EXAMPLES_PATH)
 	
-	### Installing NNI Manager ###
+	#$(_INFO) Installing NNI Manager $(_END)
 	cp -rT src/nni_manager/dist $(INSTALL_PREFIX)/nni/nni_manager
 	cp -rT src/nni_manager/node_modules $(INSTALL_PREFIX)/nni/nni_manager/node_modules
-
-	echo '#!/bin/sh' > $(BIN_PATH)/nnimanager
-	echo 'cd $(INSTALL_PREFIX)/nni/nni_manager && node main.js $$@' >> $(BIN_PATH)/nnimanager
-	chmod +x $(BIN_PATH)/nnimanager
-
-	echo '#!/bin/sh' > $(BIN_PATH)/nnictl
-	echo 'NNI_MANAGER=$(BIN_PATH)/nnimanager WEB_UI_FOLDER=$(INSTALL_PREFIX)/nni/webui python3 -m nnicmd.nnictl $$@' >> $(BIN_PATH)/nnictl
-	chmod +x $(BIN_PATH)/nnictl
-
-	### Installing Web UI ###
-	cp -rT src/webui/build $(INSTALL_PREFIX)/nni/webui
-	ln -sf $(INSTALL_PREFIX)/nni/nni_manager/node_modules/serve/bin/serve.js $(BIN_PATH)/serve
 	
-	### Installing examples ###
-	cp -rT examples $(EXAMPLES_PATH)
+	#$(_INFO) Installing Web UI $(_END)
+	cp -rT src/webui/build $(INSTALL_PREFIX)/nni/webui


-dev-install:
-	mkdir -p $(BIN_PATH)
-	mkdir -p $(INSTALL_PREFIX)/nni
+.PHONY: install-dev-modules
+install-dev-modules:
+	#$(_INFO) Installing Python SDK $(_END)
+	cd src/sdk/pynni && pip3 install $(PIP_MODE) -e .
 	
-	### Installing NNI Manager ###
-	ln -sf $(INSTALL_PREFIX)/nni/nni_manager $(PWD)/src/nni_manager/dist
-	ln -sf $(INSTALL_PREFIX)/nni/nni_manager/node_modules $(PWD)/src/nni_manager/node_modules
+	#$(_INFO) Installing nnictl $(_END)
+	cd tools && pip3 install $(PIP_MODE) -e .
 	
-	### Installing Web UI ###
-	ln -sf $(INSTALL_PREFIX)/nni/webui $(PWD)/src/webui
-	ln -sf $(INSTALL_PREFIX)/nni/nni_manager/node_modules/serve/bin/serve.js $(BIN_PATH)/serve
+	mkdir -p $(INSTALL_PREFIX)/nni
 	
-	### Installing Python SDK dependencies ###
-	pip3 install $(PIP_MODE) -r src/sdk/pynni/requirements.txt
-	### Installing Python SDK ###
-	cd src/sdk/pynni && pip3 install $(PIP_MODE) -e .
+	#$(_INFO) Installing NNI Manager $(_END)
+	ln -sf $(PWD)/src/nni_manager/dist $(INSTALL_PREFIX)/nni/nni_manager
+	ln -sf $(PWD)/src/nni_manager/node_modules $(INSTALL_PREFIX)/nni/nni_manager/node_modules
 	
-	### Installing nnictl ###
-	cd tools && pip3 install $(PIP_MODE) -e .
+	#$(_INFO) Installing Web UI $(_END)
+	ln -sf $(PWD)/src/webui/build $(INSTALL_PREFIX)/nni/webui
+
+
+.PHONY: install-scripts
+install-scripts:
+	mkdir -p $(BIN_PATH)
 	
 	echo '#!/bin/sh' > $(BIN_PATH)/nnimanager
-	echo 'cd $(INSTALL_PREFIX)/nni/nni_manager && node main.js $$@' >> $(BIN_PATH)/nnimanager
+	echo 'cd $(INSTALL_PREFIX)/nni/nni_manager' >> $(BIN_PATH)/nnimanager
+	echo '$(NODE) main.js $$@' >> $(BIN_PATH)/nnimanager
 	chmod +x $(BIN_PATH)/nnimanager
 	
 	echo '#!/bin/sh' > $(BIN_PATH)/nnictl
-	echo 'NNI_MANAGER=$(BIN_PATH)/nnimanager python3 -m nnicmd.nnictl $$@' >> $(BIN_PATH)/nnictl
+	echo 'NNI_MANAGER=$(BIN_PATH)/nnimanager \' >> $(BIN_PATH)/nnictl
+	echo 'NNI_SERVE=$(SERVE) \' >> $(BIN_PATH)/nnictl
+	echo 'WEB_UI_FOLDER=$(INSTALL_PREFIX)/nni/webui \' >> $(BIN_PATH)/nnictl
+	echo 'python3 -m nnicmd.nnictl $$@' >> $(BIN_PATH)/nnictl
 	chmod +x $(BIN_PATH)/nnictl
 	
-	### Installing examples ###
-	ln -sf $(EXAMPLES_PATH) $(PWD)/examples
+	install -Dm644 tools/bash-completion $(BASH_COMP_SCRIPT)
+ifndef _ROOT
+	echo '[[ -f $(BASH_COMP_SCRIPT) ]] && source $(BASH_COMP_SCRIPT)' >> ~/.bash_completion
+endif


-uninstall:
-	-pip3 uninstall -y nni
-	-pip3 uninstall -y nnictl
-	-rm -r $(INSTALL_PREFIX)/nni
-	-rm -r $(EXAMPLES_PATH)
-	-rm $(BIN_PATH)/serve
-	-rm $(BIN_PATH)/nnimanager
-	-rm $(BIN_PATH)/nnictl
+.PHONY: install-examples
+install-examples:
+	mkdir -p $(EXAMPLES_PATH)
+	[ $(EXAMPLES_PATH) = ${PWD}/examples ] || cp -rT examples $(EXAMPLES_PATH)
+
+
+.PHONY: update-bashrc
+ifeq (, $(shell echo $$PATH | tr ':' '\n' | grep -x '$(BIN_PATH)'))  # $(BIN_PATH) not in PATH
+    ifdef _ROOT
+        $(error $(BIN_PATH) not in PATH as root, which should never happen)
+    endif
+update-bashrc:
+	#$(_WARNING) NOTE: adding $(BIN_PATH) to PATH in bashrc $(_END)
+	echo 'export PATH="$$PATH:$(BIN_PATH)"' >> ~/.bashrc
+else  # $(BIN_PATH) already in PATH
+update-bashrc: ;
+endif
+
+
+.PHONY: check-perm
+ifdef _ROOT
+check-perm:
+	#$(_WARNING) Run easy-install as root is not optimal $(_END)
+	#$(_WARNING) Suggest run as non-privileged user or manually install instead $(_END)
+	#$(_WARNING) Continue easy-install as root? (y/N) $(_END)
+	@read CONFIRM && [ "$$CONFIRM" = y ]
+else
+check-perm: ;
+endif
+
+
+.PHONY: check-dev-env
+check-dev-env:
+	#$(_INFO) Checking developing environment... $(_END)
+ifdef _ROOT
+	$(error You should not develop NNI as root)
+endif
+ifdef _MISS_DEPS
+	$(error Please install Node.js, Yarn, and Serve to develop NNI)
+endif
+	#$(_INFO) Pass! $(_END)
+
+# Helper targets end
--- a/install.sh
+++ b/install.sh
 #!/bin/bash
-INSTALL_PREFIX=${HOME}/.local
-mkdir -p ${INSTALL_PREFIX}
-wget -4 -nc https://nodejs.org/dist/v10.9.0/node-v10.9.0-linux-x64.tar.xz --header "Referer: nodejs.org"
-tar -xf 'node-v10.9.0-linux-x64.tar.xz'
-cp -rT node-v10.9.0-linux-x64 ${INSTALL_PREFIX}/node
-rm -rf  node-v10.9.0-linux-x64*
-wget -4 -nc https://github.com/yarnpkg/yarn/releases/download/v1.9.4/yarn-v1.9.4.tar.gz
-tar -xf 'yarn-v1.9.4.tar.gz'
-cp -rT yarn-v1.9.4 ${INSTALL_PREFIX}/yarn
-rm -rf yarn-v1.9.4*
-NODE_BIN=${INSTALL_PREFIX}/node/bin
-YARN_BIN=${INSTALL_PREFIX}/yarn/bin
-export PATH=${INSTALL_PREFIX}/node/bin:${INSTALL_PREFIX}/yarn/bin:$PATH
-echo $PATH|grep -q ${NODE_BIN} || echo "export PATH=${NODE_BIN}:\${PATH}" >> ${HOME}/.bashrc
-echo $PATH|grep -q ${YARN_BIN} || echo "export PATH=${YARN_BIN}:\${PATH}" >> ${HOME}/.bashrc
-source ${HOME}/.bashrc
-make
-make install
\ No newline at end of file
+make easy-install
+source ~/.bashrc
--- a/src/nni_manager/package.json
+++ b/src/nni_manager/package.json
@@ -15,7 +15,6 @@
    "express": "^4.16.3",
    "node-nvidia-smi": "^1.0.0",
    "rx": "^4.1.0",
-    "serve": "^9.6.0",
    "sqlite3": "^4.0.2",
    "ssh2": "^0.6.1",
    "stream-buffers": "^3.0.2",

--- a/src/nni_manager/yarn.lock
+++ b/src/nni_manager/yarn.lock
@@ -213,10 +213,6 @@
  version "2.3.3"
  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.3.tgz#7f226d67d654ec9070e755f46daebf014628e9d9"

-"@zeit/schemas@2.1.1":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@zeit/schemas/-/schemas-2.1.1.tgz#bca9d84df177c85f2d2a7dad37512f384761b23d"
-
 abbrev@1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -228,15 +224,6 @@ accepts@~1.3.5:
    mime-types "~2.1.18"
    negotiator "0.6.1"

-ajv@6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.2.tgz#678495f9b82f7cca6be248dd92f59bff5e1f4360"
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.1"
-
 ajv@^5.1.0:
  version "5.5.2"
  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
@@ -246,12 +233,6 @@ ajv@^5.1.0:
    fast-json-stable-stringify "^2.0.0"
    json-schema-traverse "^0.3.0"

-ansi-align@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
-  dependencies:
-    string-width "^2.0.0"
-
 ansi-regex@^2.0.0:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -274,10 +255,6 @@ aproba@^1.0.3:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"

-arch@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.1.tgz#8f5c2731aa35a30929221bb0640eed65175ec84e"
-
 are-we-there-yet@~1.1.2:
  version "1.1.5"
  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
@@ -285,10 +262,6 @@ are-we-there-yet@~1.1.2:
    delegates "^1.0.0"
    readable-stream "^2.0.6"

-arg@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-2.0.0.tgz#c06e7ff69ab05b3a4a03ebe0407fac4cba657545"
-
 argparse@^1.0.7:
  version "1.0.10"
  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -370,18 +343,6 @@ body-parser@1.18.2:
    raw-body "2.3.2"
    type-is "~1.6.15"

-boxen@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
-  dependencies:
-    ansi-align "^2.0.0"
-    camelcase "^4.0.0"
-    chalk "^2.0.1"
-    cli-boxes "^1.0.0"
-    string-width "^2.0.0"
-    term-size "^1.2.0"
-    widest-line "^2.0.0"
-
 brace-expansion@^1.1.7:
  version "1.1.11"
  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -409,10 +370,6 @@ callsites@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/callsites/-/callsites-1.0.1.tgz#c14c24188ce8e1d6a030b4c3c942e6ba895b6a1a"

-camelcase@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
-
 caseless@~0.12.0:
  version "0.12.0"
  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -434,14 +391,6 @@ chai@^4.1.2:
    pathval "^1.0.0"
    type-detect "^4.0.0"

-chalk@2.4.1, chalk@^2.0.1, chalk@^2.3.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
 chalk@^1.1.3:
  version "1.1.3"
  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -452,6 +401,14 @@ chalk@^1.1.3:
    strip-ansi "^3.0.0"
    supports-color "^2.0.0"

+chalk@^2.3.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
 check-error@^1.0.1, check-error@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
@@ -468,17 +425,6 @@ chownr@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"

-cli-boxes@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
-
-clipboardy@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-1.2.3.tgz#0526361bf78724c1f20be248d428e365433c07ef"
-  dependencies:
-    arch "^2.1.0"
-    execa "^0.8.0"
-
 co@^4.6.0:
  version "4.6.0"
  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -546,14 +492,6 @@ cross-spawn@^4.0.2:
    lru-cache "^4.0.1"
    which "^1.2.9"

-cross-spawn@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  dependencies:
-    lru-cache "^4.0.1"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
 dashdash@^1.12.0:
  version "1.14.1"
  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -644,30 +582,6 @@ etag@~1.8.1:
  version "1.8.1"
  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"

-execa@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
-  dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
-execa@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"
-  dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 express@^4.16.3:
  version "4.16.3"
  resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
@@ -719,20 +633,10 @@ fast-deep-equal@^1.0.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"

-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-
 fast-json-stable-stringify@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"

-fast-url-parser@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/fast-url-parser/-/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d"
-  dependencies:
-    punycode "^1.3.2"
-
 finalhandler@1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
@@ -792,10 +696,6 @@ get-func-name@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"

-get-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-
 getpass@^0.1.1:
  version "0.1.7"
  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -809,18 +709,6 @@ glob-parent@^3.0.0:
    is-glob "^3.1.0"
    path-dirname "^1.0.0"

-glob-slash@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/glob-slash/-/glob-slash-1.0.0.tgz#fe52efa433233f74a2fe64c7abb9bc848202ab95"
-
-glob-slasher@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/glob-slasher/-/glob-slasher-1.0.1.tgz#747a0e5bb222642ee10d3e05443e109493cb0f8e"
-  dependencies:
-    glob-slash "^1.0.0"
-    lodash.isobject "^2.4.1"
-    toxic "^1.0.0"
-
 glob@7.1.2, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1:
  version "7.1.2"
  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -956,10 +844,6 @@ is-glob@^3.1.0:
  dependencies:
    is-extglob "^2.1.0"

-is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-
 is-typedarray@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -995,10 +879,6 @@ json-schema-traverse@^0.3.0:
  version "0.3.1"
  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"

-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-
 json-schema@0.2.3:
  version "0.2.3"
  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
@@ -1016,20 +896,6 @@ jsprim@^1.2.2:
    json-schema "0.2.3"
    verror "1.10.0"

-lodash._objecttypes@~2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz#7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11"
-
-lodash.isobject@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-2.4.1.tgz#5a2e47fe69953f1ee631a7eba1fe64d2d06558f5"
-  dependencies:
-    lodash._objecttypes "~2.4.1"
-
-lodash@^4.17.10:
-  version "4.17.10"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-
 lru-cache@^4.0.1:
  version "4.1.3"
  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
@@ -1053,20 +919,10 @@ methods@~1.1.2:
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"

-mime-db@~1.33.0:
-  version "1.33.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
-
 mime-db@~1.35.0:
  version "1.35.0"
  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.35.0.tgz#0569d657466491283709663ad379a99b90d9ab47"

-mime-types@2.1.18:
-  version "2.1.18"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
-  dependencies:
-    mime-db "~1.33.0"
-
 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18:
  version "2.1.19"
  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.19.tgz#71e464537a7ef81c15f2db9d97e913fc0ff606f0"
@@ -1189,12 +1045,6 @@ npm-packlist@^1.1.6:
    ignore-walk "^3.0.1"
    npm-bundled "^1.0.1"

-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  dependencies:
-    path-key "^2.0.0"
-
 npmlog@^4.0.2:
  version "4.1.2"
  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
@@ -1243,10 +1093,6 @@ osenv@^0.1.4:
    os-homedir "^1.0.0"
    os-tmpdir "^1.0.0"

-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-
 parent-module@^0.1.0:
  version "0.1.0"
  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-0.1.0.tgz#b5292863a1e8c476ecf857e7d75c98920b24b8a6"
@@ -1265,14 +1111,6 @@ path-is-absolute@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"

-path-is-inside@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-
-path-key@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-
 path-parse@^1.0.5:
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
@@ -1281,10 +1119,6 @@ path-to-regexp@0.1.7:
  version "0.1.7"
  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"

-path-to-regexp@2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45"
-
 pathval@^1.0.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
@@ -1326,14 +1160,10 @@ pseudomap@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"

-punycode@^1.3.2, punycode@^1.4.1:
+punycode@^1.4.1:
  version "1.4.1"
  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"

-punycode@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-
 qs@6.5.1:
  version "6.5.1"
  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
@@ -1342,7 +1172,7 @@ qs@~6.5.1:
  version "6.5.2"
  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"

-range-parser@1.2.0, range-parser@~1.2.0:
+range-parser@~1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"

@@ -1355,7 +1185,7 @@ raw-body@2.3.2:
    iconv-lite "0.4.19"
    unpipe "1.0.0"

-rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
+rc@^1.2.7:
  version "1.2.8"
  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
  dependencies:
@@ -1380,19 +1210,6 @@ reflect-metadata@^0.1.10:
  version "0.1.12"
  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2"

-registry-auth-token@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
-  dependencies:
-    rc "^1.1.6"
-    safe-buffer "^5.0.1"
-
-registry-url@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
-  dependencies:
-    rc "^1.0.1"
-
 request@^2.87.0:
  version "2.87.0"
  resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
@@ -1480,20 +1297,6 @@ send@0.16.2:
    range-parser "~1.2.0"
    statuses "~1.4.0"

-serve-handler@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/serve-handler/-/serve-handler-4.0.0.tgz#cf2a40f27f7a5ec29cbbd1732fcd6a16afdc0c41"
-  dependencies:
-    bytes "3.0.0"
-    content-disposition "0.5.2"
-    fast-url-parser "1.1.3"
-    glob-slasher "1.0.1"
-    mime-types "2.1.18"
-    minimatch "3.0.4"
-    path-is-inside "1.0.2"
-    path-to-regexp "2.2.1"
-    range-parser "1.2.0"
-
 serve-static@1.13.2:
  version "1.13.2"
  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
@@ -1503,19 +1306,6 @@ serve-static@1.13.2:
    parseurl "~1.3.2"
    send "0.16.2"

-serve@^9.6.0:
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/serve/-/serve-9.6.0.tgz#303f198c03ad2d47eb90972447c7bd5878a4c7ac"
-  dependencies:
-    "@zeit/schemas" "2.1.1"
-    ajv "6.5.2"
-    arg "2.0.0"
-    boxen "1.3.0"
-    chalk "2.4.1"
-    clipboardy "1.2.3"
-    serve-handler "4.0.0"
-    update-check "1.5.2"
-
 set-blocking@~2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -1528,16 +1318,6 @@ setprototypeof@1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"

-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  dependencies:
-    shebang-regex "^1.0.0"
-
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-
 signal-exit@^3.0.0:
  version "3.0.2"
  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -1618,7 +1398,7 @@ string-width@^1.0.1:
    is-fullwidth-code-point "^1.0.0"
    strip-ansi "^3.0.0"

-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1:
+"string-width@^1.0.2 || 2":
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
  dependencies:
@@ -1643,10 +1423,6 @@ strip-ansi@^4.0.0:
  dependencies:
    ansi-regex "^3.0.0"

-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-
 strip-json-comments@~2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
@@ -1677,12 +1453,6 @@ tar@^4:
    safe-buffer "^5.1.2"
    yallist "^3.0.2"

-term-size@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
-  dependencies:
-    execa "^0.7.0"
-
 tmp@^0.0.33:
  version "0.0.33"
  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -1699,12 +1469,6 @@ tree-kill@^1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"

-toxic@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/toxic/-/toxic-1.0.1.tgz#8c2e2528da591100adc3883f2c0e56acfb1c7288"
-  dependencies:
-    lodash "^4.17.10"
-
 ts-deferred@^1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/ts-deferred/-/ts-deferred-1.0.4.tgz#58145ebaeef5b8f2a290b8cec3d060839f9489c7"
@@ -1795,19 +1559,6 @@ unpipe@1.0.0, unpipe@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"

-update-check@1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/update-check/-/update-check-1.5.2.tgz#2fe09f725c543440b3d7dabe8971f2d5caaedc28"
-  dependencies:
-    registry-auth-token "3.3.2"
-    registry-url "3.1.0"
-
-uri-js@^4.2.1:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  dependencies:
-    punycode "^2.1.0"
-
 util-deprecate@~1.0.1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -1844,12 +1595,6 @@ wide-align@^1.1.0:
  dependencies:
    string-width "^1.0.2 || 2"

-widest-line@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz#0142a4e8a243f8882c0233aa0e0281aa76152273"
-  dependencies:
-    string-width "^2.1.1"
-
 wrappy@1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"

--- a/tools/bash-completion
+++ b/tools/bash-completion
@@ -43,11 +43,11 @@ __nnictl_remain_args()

 _nnictl()
 {
-    if [ ${#COMP_WORDS[@]} == 2 ]; then
+    if [[ ${#COMP_WORDS[@]} -eq 2 ]]; then
        # completing frst argument from __nnictl_cmds
        COMPREPLY=($(compgen -W "$__nnictl_cmds" -- "${COMP_WORDS[1]}"))

-    elif [ ${#COMP_WORDS[@]} == 3 ]; then
+    elif [[ ${#COMP_WORDS[@]} -eq 3 ]]; then
        # completing second argument from __nnictl_${FirstArg}_cmds
        local args=__nnictl_${COMP_WORDS[1]}_cmds
        COMPREPLY=($(compgen -W "${!args}" -- "${COMP_WORDS[2]}"))

--- a/tools/nnicmd/webui_utils.py
+++ b/tools/nnicmd/webui_utils.py
@@ -19,19 +19,20 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


-import psutil
 import os
+import psutil
 from socket import AddressFamily
+from subprocess import Popen, PIPE
 from .rest_utils import rest_get
 from .config_utils import Config
-from subprocess import Popen, PIPE
 from .common_utils import print_error, print_normal
 from .constants import STDOUT_FULL_PATH, STDERR_FULL_PATH

 def start_web_ui(port):
    '''start web ui'''
+    serve = os.environ.get('NNI_SERVE', 'serve')
    web_ui = os.environ.get('WEB_UI_FOLDER')
-    cmds = ['serve', '-s', '-n', web_ui, '-l', str(port)]
+    cmds = [serve, '-s', '-n', web_ui, '-l', str(port)]
    stdout_file = open(STDOUT_FULL_PATH, 'a+')
    stderr_file = open(STDERR_FULL_PATH, 'a+')
    webui_process = Popen(cmds, stdout=stdout_file, stderr=stderr_file)
@@ -85,4 +86,4 @@ def check_web_ui():
        response = rest_get(url, 3)
        if response and response.status_code == 200:
            return True
-    return False
\ No newline at end of file
+    return False