Merge pull request #113 from AnalyticalGraphicsInc/node-8

Node 8 upgrade
This commit is contained in:
likangning93 2017-11-06 15:25:22 -05:00 committed by GitHub
commit 90b0f319c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 11 deletions

3
.gitattributes vendored Normal file
View File

@ -0,0 +1,3 @@
# Auto detect text files and perform LF normalization
* text=auto
package.json text eol=lf

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
# NPM
node_modules
npm-debug.log
package-lock.json
# WebStorm user-specific
.idea/workspace.xml

View File

@ -7,6 +7,7 @@
.eslintcache
.eslintignore
.eslintrc.json
.gitattributes
.nyc_output
.npmignore
.travis.yml

View File

@ -1,7 +1,6 @@
language: node_js
node_js:
- "4"
- "6"
- "8"
script:
- npm run eslint
- npm run test -- --failTaskOnError --suppressPassed
@ -9,4 +8,4 @@ script:
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.
- if node --version | grep -q ^v6 ; npm run coverage && npm run coveralls; fi
- if node --version | grep -q ^v8 ; npm run coverage && npm run coveralls; fi

View File

@ -168,7 +168,7 @@ function writeEmbeddedTextures(gltf) {
var textureSource = texture.source;
var textureByteLength = textureSource.length;
image.mimeType = mime.lookup(texture.extension);
image.mimeType = mime.getType(texture.extension);
image.bufferView = gltf.bufferViews.length;
gltf.bufferViews.push({
buffer : 0,

View File

@ -26,17 +26,16 @@
"node": ">=4.0.0"
},
"dependencies": {
"bluebird": "^3.5.0",
"cesium": "^1.36.0",
"fs-extra": "^4.0.1",
"bluebird": "^3.5.1",
"cesium": "^1.39.0",
"fs-extra": "^4.0.2",
"jpeg-js": "^0.3.3",
"mime": "^1.3.6",
"mime": "^2.0.3",
"pngjs": "^3.3.0",
"uuid": "^3.1.0",
"yargs": "^8.0.2"
"yargs": "^10.0.3"
},
"devDependencies": {
"coveralls": "^2.13.1",
"coveralls": "^3.0.0",
"eslint": "^4.4.1",
"eslint-config-cesium": "^2.0.1",
"gulp": "^3.9.1",