From 7485a2ec50f7527c8159ec6fbef74ab2cde81eb2 Mon Sep 17 00:00:00 2001
From: squidfunk <martin.donath@squidfunk.com>
Date: Thu, 16 Mar 2017 12:54:13 +0100
Subject: [PATCH] Switch back to yarn

---
 .travis.yml   | 10 +++++-----
 scripts/build |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4bd4293ab..87b32afb8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,22 +38,22 @@ git:
 # Cache dependencies
 cache:
   pip: true
-  # yarn: true
+  yarn: true
   directories:
     - node_modules
 
 # Install yarn as Travis doesn't support it out of the box
-# before_install:
-#   - npm install -g yarn@v0.22.0
+before_install:
+  - npm install -g yarn@v0.22.0
 
 # Install dependencies
 install:
-  - npm install --no-optional
+  - yarn install --ignore-optional
   - pip install --user -r requirements.txt
 
 # Perform build and tests
 script:
-  - npm run build
+  - yarn run build
 
 # -----------------------------------------------------------------------------
 # Additional builds
diff --git a/scripts/build b/scripts/build
index 5564b0871..4c7513177 100755
--- a/scripts/build
+++ b/scripts/build
@@ -20,12 +20,12 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-# Check if "npm install" was executed
-if [[ ! -d "$(npm bin)" ]]; then
+# Check if "yarn install" was executed
+if [[ ! -d "$(yarn bin)" ]]; then
   echo "\"node_modules\" not found:"
-  echo "npm install"
+  echo "yarn install"
   exit 1
 fi
 
 # Run command
-"$(npm bin)"/gulp build --clean --optimize --revision "$@"
+"$(yarn bin)"/gulp build --clean --optimize --revision "$@"