From 6ddf1a4fcc1ba9513aefb470b2c73a015033bc67 Mon Sep 17 00:00:00 2001 From: ankittre2000 Date: Fri, 10 Feb 2023 13:15:01 -0500 Subject: [PATCH 1/7] Update fs-extra (no code change) --- .gitignore | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2f139fe..b2738a3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ node_modules npm-debug.log package-lock.json +yarn.lock # WebStorm user-specific .idea/workspace.xml diff --git a/package.json b/package.json index 1bae769..d74bd73 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "dependencies": { "bluebird": "^3.7.2", "cesium": "^1.86.1", - "fs-extra": "^10.0.0", + "fs-extra": "^11.0.0", "jpeg-js": "^0.4.3", "mime": "^2.5.2", "pngjs": "^6.0.0", From 53fd514bb0abb3bd6e10d3def1812fbb244b56f3 Mon Sep 17 00:00:00 2001 From: ankittre2000 Date: Fri, 10 Feb 2023 13:17:47 -0500 Subject: [PATCH 2/7] Update jasmine (minor code change) --- gulpfile.js | 11 ++++++----- package.json | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index d8528f8..c1fd135 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -37,19 +37,20 @@ module.exports = { "generate-third-party": generateThirdParty, }; -function test(done) { +async function test(done) { const jasmine = new Jasmine(); jasmine.loadConfigFile("specs/jasmine.json"); + jasmine.exitOnCompletion = false; jasmine.addReporter( new JasmineSpecReporter({ displaySuccessfulSpec: !defined(argv.suppressPassed) || !argv.suppressPassed, }) ); - jasmine.execute(); - jasmine.onComplete(function (passed) { - done(argv.failTaskOnError && !passed ? 1 : 0); - }); + const results = await jasmine.execute(); + if (argv.failTaskOnError && results.overallStatus === "failed") { + process.exitCode = 1; + } } function testWatch() { diff --git a/package.json b/package.json index d74bd73..e660c3e 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "eslint-plugin-node": "^11.1.0", "gulp": "^4.0.2", "husky": "^4.3.8", - "jasmine": "^3.10.0", + "jasmine": "^4.5.0", "jasmine-spec-reporter": "^7.0.0", "jsdoc": "^3.6.7", "nyc": "^15.1.0", From 3a1f2d080d5b1e0c16bab1632bfab45aaa01527f Mon Sep 17 00:00:00 2001 From: ankittre2000 Date: Fri, 10 Feb 2023 13:18:35 -0500 Subject: [PATCH 3/7] Update jsdoc (no code change) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e660c3e..8da4307 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "husky": "^4.3.8", "jasmine": "^4.5.0", "jasmine-spec-reporter": "^7.0.0", - "jsdoc": "^3.6.7", + "jsdoc": "^4.0.0", "nyc": "^15.1.0", "open": "^8.3.0", "prettier": "2.3.2", From 337e87ad2b86f5660e5e213b91d46decfe4f79a4 Mon Sep 17 00:00:00 2001 From: ankittre2000 Date: Fri, 10 Feb 2023 13:19:29 -0500 Subject: [PATCH 4/7] Update mime (no code change) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8da4307..272502c 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "cesium": "^1.86.1", "fs-extra": "^11.0.0", "jpeg-js": "^0.4.3", - "mime": "^2.5.2", + "mime": "^3.0.0", "pngjs": "^6.0.0", "yargs": "^17.2.1" }, From a95bd2f64e81bc3e5c6c2fc690b4eb75939b6637 Mon Sep 17 00:00:00 2001 From: ankittre2000 Date: Fri, 10 Feb 2023 13:20:26 -0500 Subject: [PATCH 5/7] Update prettier (no code change) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 272502c..03cc852 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "jsdoc": "^4.0.0", "nyc": "^15.1.0", "open": "^8.3.0", - "prettier": "2.3.2", + "prettier": "2.8.4", "pretty-quick": "^3.1.1" }, "husky": { From 6515bce9b9afedcaa4140a366881206de1a5acbd Mon Sep 17 00:00:00 2001 From: ankittre2000 Date: Fri, 10 Feb 2023 13:28:20 -0500 Subject: [PATCH 6/7] Update husky hooks (no code change) --- .husky/pre-commit | 4 ++++ package.json | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100755 .husky/pre-commit diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100755 index 0000000..d4a43dd --- /dev/null +++ b/.husky/pre-commit @@ -0,0 +1,4 @@ +#!/usr/bin/env sh +. "$(dirname -- "$0")/_/husky.sh" + +npm run pre-commit diff --git a/package.json b/package.json index 03cc852..709daf7 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "eslint-config-prettier": "^8.3.0", "eslint-plugin-node": "^11.1.0", "gulp": "^4.0.2", - "husky": "^4.3.8", + "husky": "^8.0.3", "jasmine": "^4.5.0", "jasmine-spec-reporter": "^7.0.0", "jsdoc": "^4.0.0", @@ -53,10 +53,12 @@ }, "husky": { "hooks": { - "pre-commit": "eslint && pretty-quick --staged" + } }, "scripts": { + "prepare": "husky install", + "pre-commit": "eslint && pretty-quick --staged", "jsdoc": "jsdoc ./lib -R ./README.md -d doc", "eslint": "eslint \"./**/*.js\" --cache --quiet", "test": "gulp test", From 2d32b8caf07968b1169ca88df0f0782382f3e7ef Mon Sep 17 00:00:00 2001 From: ankittre2000 Date: Fri, 10 Feb 2023 13:33:33 -0500 Subject: [PATCH 7/7] Remove unused argument --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index c1fd135..129190a 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -37,7 +37,7 @@ module.exports = { "generate-third-party": generateThirdParty, }; -async function test(done) { +async function test() { const jasmine = new Jasmine(); jasmine.loadConfigFile("specs/jasmine.json"); jasmine.exitOnCompletion = false;