Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
mathiasbynens committed May 31, 2016
1 parent 208971d commit 7571475
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ node_js:
- "0.10"
- "0.12"
- "5"
- "6"
before_script:
- "npm install -g grunt-cli"
# Narwhal uses a hardcoded path to openjdk v6, so use that version
Expand All @@ -17,6 +18,9 @@ before_script:
# If the enviroment stores rt.jar in a different directory, find it and symlink the directory
- "PREFIX=/usr/lib/jvm; if [ ! -d $PREFIX/java-6-openjdk ]; then for d in $PREFIX/java-6-openjdk-*; do if [ -e $d/jre/lib/rt.jar ]; then sudo ln -s $d $PREFIX/java-6-openjdk; break; fi; done; fi"
script:
- 'if [ "${TRAVIS_NODE_VERSION}" = "6" ]; then
npm run build;
fi'
- "grunt ci"
after_script:
- "grunt shell:cover-coveralls"
3 changes: 1 addition & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module.exports = function(grunt) {
'command': 'curl https://encoding.spec.whatwg.org/index-windows-1253.txt > data/index.txt'
},
'transform-data': {
'command': 'node scripts/transform-data.js'
'command': 'npm run build'
},
'cover-html': {
'command': 'istanbul cover --report "html" --verbose --dir "coverage" "tests/tests.js"'
Expand Down Expand Up @@ -72,7 +72,6 @@ module.exports = function(grunt) {

grunt.registerTask('cover', 'shell:cover-html');
grunt.registerTask('ci', [
'template',
'shell:test-narwhal',
'shell:test-phantomjs',
'shell:test-rhino',
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,16 @@
"windows-1253.js"
],
"scripts": {
"test": "node tests/tests.js"
"test": "node tests/tests.js",
"build": "node scripts/transform-data.js"
},
"devDependencies": {
"coveralls": "^2.11.6",
"grunt": "^0.4.5",
"grunt-shell": "^1.1.2",
"grunt-template": "^0.2.3",
"istanbul": "^0.4.2",
"jsesc": "^0.5.0",
"jsesc": "^2.1.0",
"qunit-extras": "^1.4.5",
"qunitjs": "~1.11.0",
"requirejs": "^2.1.22",
Expand Down
2 changes: 1 addition & 1 deletion scripts/export-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function readJSON(path) {
module.exports = {
'labels': jsesc(readJSON('data/labels.json'), {
'compact': false,
'__indent__': '\t\t'
'indentLevel': 2
}),
'encoded': jsesc(readJSON('data/encoded.json'), { 'wrap': true }),
'decoded': jsesc(readJSON('data/decoded.json'), { 'wrap': true }),
Expand Down

0 comments on commit 7571475

Please sign in to comment.