switch to yarn

build/build.ps1

@@ -3,16 +3,17 @@ python build\set_version.py
 
 # Get the latest stable version of Node.js or io.js
 Install-Product node $env:nodejs_version
+npm install -g yarn
 
 # install node modules
-npm install
+yarn install
 cd app
-npm install
+yarn install
 cd ..
 
 # build ui
 cd ui
-npm install
+yarn install
 
 # necessary to ensure native Node modules (e.g. keytar) are built against the correct version of Node)
 # yes, it needs to be run twice. it fails the first time, not sure why

build/build.sh

@@ -45,19 +45,12 @@ if [ "$FULL_BUILD" == "true" ]; then
   python "$BUILD_DIR/set_version.py"
 fi
 
-libsecret="libsecret-1-dev"
-if $LINUX && [ -z "$(dpkg-query --show --showformat='${Status}\n' "$libsecret" 2>/dev/null | grep "install ok installed")" ]; then
-  # this is needed for keytar, which does secure password/token management
-  sudo apt-get install --no-install-recommends -y "$libsecret"
-fi
-
-
 [ -d "$ROOT/dist" ] && rm -rf "$ROOT/dist"
 mkdir -p "$ROOT/dist"
 [ -d "$ROOT/app/dist" ] && rm -rf "$ROOT/app/dist"
 mkdir -p "$ROOT/app/dist"
 
-npm install
+yarn install
 
 
 
@@ -67,7 +60,8 @@ npm install
 
 (
   cd "$ROOT/ui"
-  npm install
+  yarn install
+  npm rebuild node-sass
 
   # necessary to ensure native Node modules (e.g. keytar) are built against the correct version of Node)
   # yes, it needs to be run twice. it fails the first time, not sure why
@@ -105,7 +99,7 @@ rm "$BUILD_DIR/daemon.zip"
 
 (
   cd "$ROOT/app"
-  npm install
+  yarn install
 )
 
 if [ "$FULL_BUILD" == "true" ]; then

build/prebuild.sh

@@ -41,7 +41,7 @@ set -eu
 
 if $LINUX; then
   INSTALL="$SUDO apt-get install --no-install-recommends -y"
-  $INSTALL build-essential libssl-dev libffi-dev libgmp3-dev python2.7-dev
+  $INSTALL build-essential libssl-dev libffi-dev libgmp3-dev python2.7-dev libsecret-1-dev
 elif $OSX && ! cmd_exists brew ; then
   /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 fi
@@ -88,6 +88,17 @@ if ! cmd_exists node; then
   fi
 fi
 
+if ! cmd_exists yarn; then
+  if $LINUX; then
+    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | $SUDO apt-key add -
+    echo "deb https://dl.yarnpkg.com/debian/ stable main" | $SUDO tee /etc/apt/sources.list.d/yarn.list
+    $SUDO apt-get update
+    $SUDO apt-get install yarn
+  elif $OSX; then
+    brew install yarn
+  fi
+fi
+
 if ! cmd_exists unzip; then
   if $LINUX; then
     $INSTALL unzip

build/requirements.txt

@@ -1,7 +1,5 @@
-GitPython==2.1.1
 PyGithub==1.32
 requests[security]==2.13.0
-PyInstaller==3.2.1
 uritemplate==3.0.0
 git+https://github.com/lbryio/bumpversion.git
 boto3==1.4.4

ui/README.md

@@ -1,5 +1,6 @@
 ## Development Setup
 
 - Install node and npm (linux users: [use this](https://github.com/nodesource/distributions). if that doesn't work, [this gist may be useful](https://gist.github.com/isaacs/579814))
-- Run `./watch.sh` (this will `npm install` dependencies)
+- `npm install -g yarn` (or see https://yarnpkg.com/en/docs/install)
+- Run `./watch.sh` (this will `yarn install` dependencies)
 

ui/watch.sh

@@ -14,7 +14,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
   if [ ! -d "$DIR/node_modules" ]; then
     echo "Installing NPM modules"
-    npm install
+    yarn install
   fi
 
   # run sass once without --watch to force update. then run with --watch to keep watching