mirror of
https://github.com/CesiumGS/obj2gltf.git
synced 2024-11-23 08:34:14 -05:00
Merge pull request #286 from CesiumGS/update-dependencies
Update dependencies
This commit is contained in:
commit
153517eb8e
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,6 +2,7 @@
|
|||||||
node_modules
|
node_modules
|
||||||
npm-debug.log
|
npm-debug.log
|
||||||
package-lock.json
|
package-lock.json
|
||||||
|
yarn.lock
|
||||||
|
|
||||||
# WebStorm user-specific
|
# WebStorm user-specific
|
||||||
.idea/workspace.xml
|
.idea/workspace.xml
|
||||||
|
4
.husky/pre-commit
Executable file
4
.husky/pre-commit
Executable file
@ -0,0 +1,4 @@
|
|||||||
|
#!/usr/bin/env sh
|
||||||
|
. "$(dirname -- "$0")/_/husky.sh"
|
||||||
|
|
||||||
|
npm run pre-commit
|
11
gulpfile.js
11
gulpfile.js
@ -37,19 +37,20 @@ module.exports = {
|
|||||||
"generate-third-party": generateThirdParty,
|
"generate-third-party": generateThirdParty,
|
||||||
};
|
};
|
||||||
|
|
||||||
function test(done) {
|
async function test() {
|
||||||
const jasmine = new Jasmine();
|
const jasmine = new Jasmine();
|
||||||
jasmine.loadConfigFile("specs/jasmine.json");
|
jasmine.loadConfigFile("specs/jasmine.json");
|
||||||
|
jasmine.exitOnCompletion = false;
|
||||||
jasmine.addReporter(
|
jasmine.addReporter(
|
||||||
new JasmineSpecReporter({
|
new JasmineSpecReporter({
|
||||||
displaySuccessfulSpec:
|
displaySuccessfulSpec:
|
||||||
!defined(argv.suppressPassed) || !argv.suppressPassed,
|
!defined(argv.suppressPassed) || !argv.suppressPassed,
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
jasmine.execute();
|
const results = await jasmine.execute();
|
||||||
jasmine.onComplete(function (passed) {
|
if (argv.failTaskOnError && results.overallStatus === "failed") {
|
||||||
done(argv.failTaskOnError && !passed ? 1 : 0);
|
process.exitCode = 1;
|
||||||
});
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function testWatch() {
|
function testWatch() {
|
||||||
|
16
package.json
16
package.json
@ -28,9 +28,9 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"bluebird": "^3.7.2",
|
"bluebird": "^3.7.2",
|
||||||
"cesium": "^1.86.1",
|
"cesium": "^1.86.1",
|
||||||
"fs-extra": "^10.0.0",
|
"fs-extra": "^11.0.0",
|
||||||
"jpeg-js": "^0.4.3",
|
"jpeg-js": "^0.4.3",
|
||||||
"mime": "^2.5.2",
|
"mime": "^3.0.0",
|
||||||
"pngjs": "^6.0.0",
|
"pngjs": "^6.0.0",
|
||||||
"yargs": "^17.2.1"
|
"yargs": "^17.2.1"
|
||||||
},
|
},
|
||||||
@ -42,21 +42,23 @@
|
|||||||
"eslint-config-prettier": "^8.3.0",
|
"eslint-config-prettier": "^8.3.0",
|
||||||
"eslint-plugin-node": "^11.1.0",
|
"eslint-plugin-node": "^11.1.0",
|
||||||
"gulp": "^4.0.2",
|
"gulp": "^4.0.2",
|
||||||
"husky": "^4.3.8",
|
"husky": "^8.0.3",
|
||||||
"jasmine": "^3.10.0",
|
"jasmine": "^4.5.0",
|
||||||
"jasmine-spec-reporter": "^7.0.0",
|
"jasmine-spec-reporter": "^7.0.0",
|
||||||
"jsdoc": "^3.6.7",
|
"jsdoc": "^4.0.0",
|
||||||
"nyc": "^15.1.0",
|
"nyc": "^15.1.0",
|
||||||
"open": "^8.3.0",
|
"open": "^8.3.0",
|
||||||
"prettier": "2.3.2",
|
"prettier": "2.8.4",
|
||||||
"pretty-quick": "^3.1.1"
|
"pretty-quick": "^3.1.1"
|
||||||
},
|
},
|
||||||
"husky": {
|
"husky": {
|
||||||
"hooks": {
|
"hooks": {
|
||||||
"pre-commit": "eslint && pretty-quick --staged"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
"prepare": "husky install",
|
||||||
|
"pre-commit": "eslint && pretty-quick --staged",
|
||||||
"jsdoc": "jsdoc ./lib -R ./README.md -d doc",
|
"jsdoc": "jsdoc ./lib -R ./README.md -d doc",
|
||||||
"eslint": "eslint \"./**/*.js\" --cache --quiet",
|
"eslint": "eslint \"./**/*.js\" --cache --quiet",
|
||||||
"test": "gulp test",
|
"test": "gulp test",
|
||||||
|
Loading…
Reference in New Issue
Block a user