diff --git a/.travis.yml b/.travis.yml index 73a40d0761a7b442cd2435b7ac37a59f5c13a875..890fcfd3ac3ca6f4d4ac9507586110c817dc3edf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,4 +5,6 @@ before_install: - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.5.1 - export PATH="$HOME/.yarn/bin:$PATH" install: yarn -script: yarn lint +script: +- yarn lint +- ./scripts/check-yarn-lock.sh diff --git a/package.json b/package.json index 3d2d728ad27b8c678c37b592761a82a063b7155b..ad584f83bcf0827ec6c4f2914bf9e38abc20234b 100644 --- a/package.json +++ b/package.json @@ -25,8 +25,8 @@ "aframe-input-mapping-component": "https://github.com/johnshaughnessy/aframe-input-mapping-component#feature/map-to-array", "aframe-physics-extras": "https://github.com/infinitelee/aframe-physics-extras#fix/physics-collider-crash", "aframe-physics-system": "https://github.com/infinitelee/aframe-physics-system#feature/shape-component", - "aframe-teleport-controls": "^0.3.1", "aframe-rounded": "^1.0.3", + "aframe-teleport-controls": "^0.3.1", "aframe-xr": "github:brianpeiris/aframe-xr#3162aed", "classnames": "^2.2.5", "detect-browser": "^2.1.0", @@ -75,6 +75,7 @@ "rimraf": "^2.6.2", "sass-loader": "^6.0.7", "selfsigned": "^1.10.2", + "shelljs": "^0.8.1", "style-loader": "^0.20.2", "webpack": "^4.0.1", "webpack-cli": "^2.0.9", diff --git a/scripts/check-yarn-lock.sh b/scripts/check-yarn-lock.sh new file mode 100755 index 0000000000000000000000000000000000000000..e27b56ab47bc9746933266a02f0c30b7a7b9c6e1 --- /dev/null +++ b/scripts/check-yarn-lock.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +if [ `git diff yarn.lock | wc -l` -ne 0 ]; then + echo "" + tput setaf 1 + echo "!! UNCOMMITED YARN.LOCK CHANGES !!" + tput sgr0 + echo "" + exit 1 +fi diff --git a/yarn.lock b/yarn.lock index 142ae2918c72b4edca9b86ba7f12a434eb585a51..9e4e6fbae46ef483424f8b4ada1dadce72744951 100644 --- a/yarn.lock +++ b/yarn.lock @@ -170,12 +170,6 @@ aframe-extras@^4.0.0: version "0.1.2" resolved "https://github.com/johnshaughnessy/aframe-input-mapping-component#4c7e493ad6c4a25eef27d32551c94d8b78541191" -aframe-lerp-component@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/aframe-lerp-component/-/aframe-lerp-component-1.1.0.tgz#dc8c12c53698770c30f25eef8873e34a4e79c765" - dependencies: - almost-equal "^1.1.0" - "aframe-physics-extras@https://github.com/infinitelee/aframe-physics-extras#fix/physics-collider-crash": version "0.1.2" resolved "https://github.com/infinitelee/aframe-physics-extras#49b2d5d3c0caac905783aee51d9e89dbdf7199b8" @@ -234,10 +228,6 @@ ajv@^6.0.1, ajv@^6.1.0: fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.3.0" -almost-equal@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/almost-equal/-/almost-equal-1.1.0.tgz#f851c631138757994276aa2efbe8dfa3066cccdd" - alphanum-sort@^1.0.1, alphanum-sort@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" @@ -7205,6 +7195,14 @@ shelljs@^0.7.0: interpret "^1.0.0" rechoir "^0.6.2" +shelljs@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.1.tgz#729e038c413a2254c4078b95ed46e0397154a9f1" + dependencies: + glob "^7.0.0" + interpret "^1.0.0" + rechoir "^0.6.2" + sigmund@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"