Skip to content

Commit

Permalink
Upgrade to Node 8
Browse files Browse the repository at this point in the history
  • Loading branch information
lilleyse committed Nov 6, 2017
1 parent 3c7be90 commit 9a0b977
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 27 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Auto detect text files and perform LF normalization
* text=auto
package.json text eol=lf
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# NPM
node_modules
npm-debug.log
package-lock.json

# WebStorm user-specific
.idea/workspace.xml
Expand Down
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
.eslintrc.json
.eslintcache
.eslintignore
.gitattributes
.npmignore
.travis.yml
.appveyor.yml
Expand Down
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ os:
language: node_js

node_js:
- "4"
- "6"
- "8"

script:
- npm run eslint
Expand All @@ -19,4 +18,4 @@ after_success:
## We only need to run coveralls for one node version (doesn't matter which one).
## We also ignore publishing failures, since restarting an existing travis build would otherwise break.
## Run coverage on OSX and not on linux as Linux will run compressed texture tests which will fail.
- if [[ "$TRAVIS_OS_NAME" == "osx" && $(node --version) == v6* ]]; then npm run coverage && npm run coveralls; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" && $(node --version) == v8* ]]; then npm run coverage && npm run coveralls; fi
4 changes: 1 addition & 3 deletions lib/getBinaryGltf.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,7 @@ function updateBinaryObject(gltf, objects, name, pipelineExtras, state) {

// Add additional properties for images
if (name === 'images') {
// .crn (Crunch) is not a supported mime type, so add it
mime.define({'image/crn' : ['crn']});
var mimeType = mime.lookup(object.extras._pipeline.extension);
var mimeType = mime.getType(object.extras._pipeline.extension);
KHR_binary_glTF.mimeType = mimeType;

if (mimeType !== 'image/ktx' && mimeType !== 'image/crn') {
Expand Down
4 changes: 1 addition & 3 deletions lib/writeSource.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ function writeSource(objects, name, basePath, embed, embedImage) {
if (name === 'shaders') {
object.uri = 'data:text/plain;base64,' + Buffer.from(source).toString('base64');
} else {
// .crn (Crunch) is not a supported mime type, so add it
mime.define({'image/crn' : ['crn']});
object.uri = 'data:' + mime.lookup(extension) + ';base64,' + source.toString('base64');
object.uri = 'data:' + mime.getType(extension) + ';base64,' + source.toString('base64');
}
} else {
// For compressed textures use the name stored in the extras rather than the id
Expand Down
36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,30 +26,30 @@
"node": ">=4.0.0"
},
"dependencies": {
"bluebird": "^3.4.6",
"cesium": "^1.36.0",
"clone": "^2.1.0",
"bluebird": "^3.5.1",
"cesium": "^1.39.0",
"clone": "^2.1.1",
"data-uri-to-buffer": "^2.0.0",
"deep-equal": "^1.0.1",
"fs-extra": "^4.0.1",
"image-size": "^0.6.0",
"jimp": "^0.2.27",
"jsonpath": "^0.2.9",
"mime": "^1.3.4",
"uuid": "^3.0.1",
"yargs": "^8.0.1"
"fs-extra": "^4.0.2",
"image-size": "^0.6.1",
"jimp": "^0.2.28",
"jsonpath": "^1.0.0",
"mime": "^2.0.3",
"uuid": "^3.1.0",
"yargs": "^10.0.3"
},
"devDependencies": {
"coveralls": "^2.11.15",
"eslint": "^4.1.1",
"eslint-config-cesium": "^2.0.0",
"coveralls": "^3.0.0",
"eslint": "^4.10.0",
"eslint-config-cesium": "^2.0.1",
"gulp": "^3.9.1",
"jasmine": "^2.5.2",
"jasmine-spec-reporter": "^4.1.0",
"jsdoc": "^3.4.3",
"nyc": "^11.0.2",
"jasmine": "^2.8.0",
"jasmine-spec-reporter": "^4.2.1",
"jsdoc": "^3.5.5",
"nyc": "^11.3.0",
"open": "^0.0.5",
"requirejs": "^2.3.2"
"requirejs": "^2.3.5"
},
"scripts": {
"build-cesium": "gulp build-cesium",
Expand Down

0 comments on commit 9a0b977

Please sign in to comment.