浏览代码

add jest eslint

Garrett Johnson 5 年之前
父节点
当前提交
abd3300b01
共有 4 个文件被更改,包括 33 次插入27 次删除
  1. 2 1
      .eslintrc.json
  2. 27 21
      package-lock.json
  3. 3 2
      package.json
  4. 1 3
      test/PriorityQueue.test.js

+ 2 - 1
.eslintrc.json

@@ -1,4 +1,5 @@
 {
 {
 	"root": true,
 	"root": true,
-	"extends": "./node_modules/eslint-config-mdcs/index.js"
+	"extends": "./node_modules/eslint-config-mdcs/index.js",
+	"plugins": [ "jest" ]
 }
 }

+ 27 - 21
package-lock.json

@@ -2282,9 +2282,9 @@
       }
       }
     },
     },
     "@types/json-schema": {
     "@types/json-schema": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.3.tgz",
-      "integrity": "sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz",
+      "integrity": "sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==",
       "dev": true
       "dev": true
     },
     },
     "@types/q": {
     "@types/q": {
@@ -2315,27 +2315,39 @@
       "dev": true
       "dev": true
     },
     },
     "@typescript-eslint/experimental-utils": {
     "@typescript-eslint/experimental-utils": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.12.0.tgz",
-      "integrity": "sha512-jv4gYpw5N5BrWF3ntROvCuLe1IjRenLy5+U57J24NbPGwZFAjhnM45qpq0nDH1y/AZMb3Br25YiNVwyPbz6RkA==",
+      "version": "2.25.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.25.0.tgz",
+      "integrity": "sha512-0IZ4ZR5QkFYbaJk+8eJ2kYeA+1tzOE1sBjbwwtSV85oNWYUBep+EyhlZ7DLUCyhMUGuJpcCCFL0fDtYAP1zMZw==",
       "dev": true,
       "dev": true,
       "requires": {
       "requires": {
         "@types/json-schema": "^7.0.3",
         "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/typescript-estree": "2.12.0",
-        "eslint-scope": "^5.0.0"
+        "@typescript-eslint/typescript-estree": "2.25.0",
+        "eslint-scope": "^5.0.0",
+        "eslint-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "eslint-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz",
+          "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==",
+          "dev": true,
+          "requires": {
+            "eslint-visitor-keys": "^1.1.0"
+          }
+        }
       }
       }
     },
     },
     "@typescript-eslint/typescript-estree": {
     "@typescript-eslint/typescript-estree": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.12.0.tgz",
-      "integrity": "sha512-rGehVfjHEn8Frh9UW02ZZIfJs6SIIxIu/K1bbci8rFfDE/1lQ8krIJy5OXOV3DVnNdDPtoiPOdEANkLMrwXbiQ==",
+      "version": "2.25.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.25.0.tgz",
+      "integrity": "sha512-VUksmx5lDxSi6GfmwSK7SSoIKSw9anukWWNitQPqt58LuYrKalzsgeuignbqnB+rK/xxGlSsCy8lYnwFfB6YJg==",
       "dev": true,
       "dev": true,
       "requires": {
       "requires": {
         "debug": "^4.1.1",
         "debug": "^4.1.1",
         "eslint-visitor-keys": "^1.1.0",
         "eslint-visitor-keys": "^1.1.0",
         "glob": "^7.1.6",
         "glob": "^7.1.6",
         "is-glob": "^4.0.1",
         "is-glob": "^4.0.1",
-        "lodash.unescape": "4.0.1",
+        "lodash": "^4.17.15",
         "semver": "^6.3.0",
         "semver": "^6.3.0",
         "tsutils": "^3.17.1"
         "tsutils": "^3.17.1"
       },
       },
@@ -4394,9 +4406,9 @@
       "dev": true
       "dev": true
     },
     },
     "eslint-plugin-jest": {
     "eslint-plugin-jest": {
-      "version": "23.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.1.1.tgz",
-      "integrity": "sha512-2oPxHKNh4j1zmJ6GaCBuGcb8FVZU7YjFUOJzGOPnl9ic7VA/MGAskArLJiRIlnFUmi1EUxY+UiATAy8dv8s5JA==",
+      "version": "23.8.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.8.2.tgz",
+      "integrity": "sha512-xwbnvOsotSV27MtAe7s8uGWOori0nUsrXh2f1EnpmXua8sDfY6VZhHAhHg2sqK7HBNycRQExF074XSZ7DvfoFg==",
       "dev": true,
       "dev": true,
       "requires": {
       "requires": {
         "@typescript-eslint/experimental-utils": "^2.5.0"
         "@typescript-eslint/experimental-utils": "^2.5.0"
@@ -7065,12 +7077,6 @@
       "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
       "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
       "dev": true
       "dev": true
     },
     },
-    "lodash.unescape": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz",
-      "integrity": "sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=",
-      "dev": true
-    },
     "lodash.uniq": {
     "lodash.uniq": {
       "version": "4.5.0",
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
       "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",

+ 3 - 2
package.json

@@ -12,7 +12,8 @@
     "geometry",
     "geometry",
     "terrain",
     "terrain",
     "cesium"
     "cesium"
-  ],
+	],
+	"type": "module",
   "main": "src/index.js",
   "main": "src/index.js",
   "scripts": {
   "scripts": {
     "start": "parcel watch example/index.html --out-dir ./example/bundle/ --public-url . --no-cache",
     "start": "parcel watch example/index.html --out-dir ./example/bundle/ --public-url . --no-cache",
@@ -34,7 +35,7 @@
     "babel-jest": "^24.9.0",
     "babel-jest": "^24.9.0",
     "eslint": "^6.5.1",
     "eslint": "^6.5.1",
     "eslint-config-mdcs": "^4.2.3",
     "eslint-config-mdcs": "^4.2.3",
-    "eslint-plugin-jest": "^23.1.1",
+    "eslint-plugin-jest": "^23.8.2",
     "jest": "^24.9.0",
     "jest": "^24.9.0",
     "jest-cli": "^24.9.0",
     "jest-cli": "^24.9.0",
     "parcel-bundler": "^1.12.4",
     "parcel-bundler": "^1.12.4",

+ 1 - 3
test/PriorityQueue.test.js

@@ -92,10 +92,8 @@ describe( 'PriorityQueue', () => {
 		expect( queue.currJobs ).toEqual( 1 );
 		expect( queue.currJobs ).toEqual( 1 );
 		expect( resolveFunc ).not.toEqual( null );
 		expect( resolveFunc ).not.toEqual( null );
 		expect( called ).toEqual( 1 );
 		expect( called ).toEqual( 1 );
-		resolveFunc();
-		await nextTick();
-		expect( queue.currJobs ).toEqual( 0 );
 
 
+		resolveFunc();
 		await nextFrame();
 		await nextFrame();
 
 
 		expect( queue.currJobs ).toEqual( 1 );
 		expect( queue.currJobs ).toEqual( 1 );