Merge branch 'master' into fixup-after-230

.travis.yml

@@ -18,14 +18,16 @@ addons:
     - debian-sid
     packages:
     - shellcheck
+install:
+  - npm install # <-- yarn still messes up nested bins: https://github.com/yarnpkg/yarn/issues/760
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then npm run install:lanyon; fi
 before_install:
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then which gsed || brew install gnu-sed; fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then which gsed || brew install gnu-sed; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then which gtimeout || brew install coreutils; fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then which gtimeout || brew install coreutils; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then which bundle || gem install bundler; fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then which bundle || gem install bundler; fi
-  - bash --version
+- bash --version
-  - awk --version
+- awk --version
-install: npm install # <-- yarn still messes up nested bins: https://github.com/yarnpkg/yarn/issues/760
 before_cache:
   - rm -f ./node_modules/.bin/which # <-- workaround for https://github.com/travis-ci/travis-ci/issues/5092
 cache:

package.json

@@ -7,7 +7,7 @@
     "build": "lanyon build",
     "deploy": "lanyon deploy",
     "encrypt": "lanyon encrypt",
-    "install": "lanyon postinstall",
+    "install:lanyon": "lanyon install",
     "lint": "shellcheck --shell=bash $(find . -name '*.sh' -maxdepth 2)",
     "release:major": "env SEMANTIC=major npm run release",
     "release:minor": "env SEMANTIC=minor npm run release",
@@ -39,7 +39,7 @@
     "browser-sync": "2.18.5",
     "cross-env": "3.1.3",
     "fakefile": "0.0.8",
-    "lanyon": "0.0.47",
+    "lanyon": "0.0.54",
     "next-update": "1.5.1",
     "npm-run-all": "3.1.2",
     "replace": "^0.3.0"