Skip to content

Commit

Permalink
chore(): enable yarn package management (#484)
Browse files Browse the repository at this point in the history
* chore: Enable yarn package management

* chore: phantomjs yarn workaround

* chore(pacakge): bump phantomjs for npm_config_tmp fix

* chore: add yarn bug issue reference

* chore: treat lock file as binary

* docs(readme): add note for node-sass / yarn issue

* ci(Travis): build only master / develop

 - Prevents pull requests executing builds twice
 - Builds master + develop branches plus pull requests
  • Loading branch information
joshwiens authored and emoralesb05 committed Apr 5, 2017
1 parent 878bace commit 12ea9c4
Show file tree
Hide file tree
Showing 5 changed files with 6,698 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
yarn.lock -diff
9 changes: 7 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
sudo: required
sudo: required
dist: trusty
language: node_js
node_js:
- '6.9.4'
branches:
only:
- master
- develop
addons:
firefox: latest
before_script:
Expand All @@ -11,7 +15,8 @@ before_script:
- sh -e /etc/init.d/xvfb start
install:
- npm i process-nextick-args util-deprecate buffer-shims
- npm install
- yarn install
- npm rebuild node-sass # Workaround for https://github.com/yarnpkg/yarn/issues/1981
script:
- npm run lint
- npm run test
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Covalent is a reusable UI platform from Teradata for building web applications w
* Install Node packages `npm i`
* Update Webdriver `webdriver-manager update` and `./node_modules/.bin/webdriver-manager update`
* Run local build `ng serve` or `ng serve --aot`

* If using yarn locally, `npm rebuild node-sass` is required for https://github.com/yarnpkg/yarn/issues/1981 as of `v0.22.0`
---

* [Getting Started](docs/GETTING_STARTED.md)
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"karma-coverage-istanbul-reporter": "^0.3.0",
"merge2": "1.0.2",
"node-sass": "3.8.0",
"phantomjs-prebuilt": "2.1.7",
"phantomjs-prebuilt": "2.1.14",
"protractor": "~5.1.0",
"require-dir": "0.3.0",
"rollup": "^0.35.9",
Expand All @@ -118,4 +118,4 @@
"tslint": "^4.5.1",
"typescript": "^2.1.6"
}
}
}
Loading

0 comments on commit 12ea9c4

Please sign in to comment.