adding yarn lock file and removing it from git ignore (#3648)

* adding yarn lock file and removing it from git ignore
* travis will now run yarn by default that it sees the lock file
This commit is contained in:
Elod-Arpad Szopos 2016-12-30 18:39:02 +02:00 committed by Sean Larkin
parent 7d1774666a
commit bfcc5942bb
4 changed files with 4070 additions and 3 deletions

1
.gitignore vendored
View File

@ -9,5 +9,4 @@
.DS_Store .DS_Store
*.log *.log
.idea .idea
yarn.lock
.vscode .vscode

View File

@ -36,7 +36,7 @@ matrix:
script: npm run travis:$JOB_PART script: npm run travis:$JOB_PART
before_install: if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi before_install: if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi
install: before_script:
- bash ./ci/travis-install.sh - bash ./ci/travis-install.sh
after_success: after_success:
- cat ./coverage/lcov.info | node_modules/.bin/coveralls --verbose - cat ./coverage/lcov.info | node_modules/.bin/coveralls --verbose

View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
set -ev set -ev
npm install yarn -g && yarn install && yarn link || true && yarn link webpack; yarn link || true && yarn link webpack;

4068
yarn.lock Normal file

File diff suppressed because it is too large Load Diff