Skip to content

Commit 9ffe804

Browse files
danezdanez
committed
chore: Fix code coverage and ts test setup
1 parent ad16284 commit 9ffe804

File tree

9 files changed

+42
-91
lines changed

9 files changed

+42
-91
lines changed

‎.eslintrc.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
// This file was created by spire-plugin-eslint for editor support
2-
module.exports = require('@researchgate/spire-config/eslint/react-typescript');
2+
module.exports = require('@researchgate/spire-config/eslint/react-typescript');

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ npm-debug.log*
22
yarn-error.log
33
/node_modules
44
/lib
5-
/src/coverage
5+
coverage
66
/.docs
77
.DS_Store
88
/.vscode
99
tsconfig.tsbuildinfo
1010
typings
11-
test/coverage

‎package.json‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
"spire": "2.1.4",
3636
"spire-plugin-semantic-release": "2.1.5",
3737
"storybook-readme": "5.0.8",
38-
"ts-jest": "26.1.0",
3938
"typescript": "3.9.5"
4039
},
4140
"files": [
@@ -65,10 +64,6 @@
6564
"type": "git",
6665
"url": "https://github.com/researchgate/react-intersection-observer.git"
6766
},
68-
"jest": {
69-
"rootDir": "test",
70-
"preset": "ts-jest/presets/js-with-babel"
71-
},
7267
"prettier": "@researchgate/prettier-config",
7368
"spire": {
7469
"extends": [
@@ -86,10 +81,10 @@
8681
"scripts": {
8782
"build": "run-s build:js build:typescript",
8883
"build:js": "cross-env BABEL_ENV=production BABEL_OUTPUT=cjs babel src -x .ts,.tsx -d lib/js",
89-
"build:typescript": "cross-env tsc --build src",
84+
"build:typescript": "cross-env tsc --build",
9085
"build:storybook": "build-storybook -o .docs",
9186
"clean:lib": "rm -rf lib",
92-
"clean:typescript": "tsc --build --clean src",
87+
"clean:typescript": "tsc --build --clean",
9388
"clean": "run-p clean:*",
9489
"format": "spire format",
9590
"lint": "spire lint",

‎src/tsconfig.json‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎test/tsconfig.json‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎test/unit/IntersectionObserver.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import IntersectionObserver, {
55
getOptions,
66
} from '../../src/IntersectionObserver';
77
import { callback, observerElementsMap } from '../../src/observer';
8-
import mockTarget from './mock-target';
8+
import mockTarget from './__mocks__/mock-target';
99

1010
jest.mock('react-dom', () => {
1111
const { findDOMNode } = jest.requireActual('react-dom');
12-
const target = jest.requireActual('./mock-target');
12+
const target = jest.requireActual('./__mocks__/mock-target');
1313
return {
1414
findDOMNode(x) {
1515
const found = findDOMNode(x);

test/unit/mock-target.js renamed to test/unit/__mocks__/mock-target.js

File renamed without changes.

tsconfig.base.json renamed to tsconfig.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
"forceConsistentCasingInFileNames": true,
1212
"declaration": true,
1313
"jsx": "react",
14-
"declarationDir": "typings"
15-
}
14+
"rootDir": ".",
15+
"declarationDir": "./typings",
16+
"outDir": "./lib/es"
17+
},
18+
"include": ["src/**/*.ts"]
1619
}

‎yarn.lock‎

Lines changed: 31 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -3917,21 +3917,14 @@ browserslist@^4.11.1, browserslist@^4.8.5:
39173917
node-releases "^1.1.53"
39183918
pkg-up "^2.0.0"
39193919

3920-
[email protected]:
3921-
version "0.2.6"
3922-
resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
3923-
integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==
3924-
dependencies:
3925-
fast-json-stable-stringify "2.x"
3926-
39273920
[email protected]:
39283921
version "2.1.1"
39293922
resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
39303923
integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
39313924
dependencies:
39323925
node-int64 "^0.4.0"
39333926

3934-
buffer-from@1.x, buffer-from@^1.0.0:
3927+
buffer-from@^1.0.0:
39353928
version "1.1.1"
39363929
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
39373930
integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
@@ -6342,7 +6335,7 @@ fast-glob@^3.1.1:
63426335
micromatch "^4.0.2"
63436336
picomatch "^2.2.1"
63446337

6345-
fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
6338+
fast-json-stable-stringify@^2.0.0:
63466339
version "2.1.0"
63476340
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
63486341
integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
@@ -8838,20 +8831,20 @@ json3@^3.3.2:
88388831
resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
88398832
integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
88408833

8841-
[email protected], json5@^2.1.1, json5@^2.1.2:
8842-
version "2.1.3"
8843-
resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
8844-
integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
8845-
dependencies:
8846-
minimist "^1.2.5"
8847-
88488834
json5@^1.0.1:
88498835
version "1.0.1"
88508836
resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
88518837
integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
88528838
dependencies:
88538839
minimist "^1.2.0"
88548840

8841+
json5@^2.1.1, json5@^2.1.2:
8842+
version "2.1.3"
8843+
resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
8844+
integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
8845+
dependencies:
8846+
minimist "^1.2.5"
8847+
88558848
jsonfile@^2.1.0:
88568849
version "2.4.0"
88578850
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
@@ -9409,7 +9402,7 @@ lodash.keys@^3.0.0:
94099402
lodash.isarguments "^3.0.0"
94109403
lodash.isarray "^3.0.0"
94119404

9412-
lodash.memoize@4.x, lodash.memoize@^4.1.2:
9405+
lodash.memoize@^4.1.2:
94139406
version "4.1.2"
94149407
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
94159408
integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
@@ -9558,11 +9551,6 @@ make-dir@^3.0.0, make-dir@^3.0.2:
95589551
dependencies:
95599552
semver "^6.0.0"
95609553

9561-
[email protected]:
9562-
version "1.3.6"
9563-
resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
9564-
integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
9565-
95669554
make-fetch-happen@^5.0.0:
95679555
version "5.0.2"
95689556
resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz#aa8387104f2687edca01c8687ee45013d02d19bd"
@@ -9801,14 +9789,6 @@ microevent.ts@~0.1.1:
98019789
resolved "https://registry.yarnpkg.com/microevent.ts/-/microevent.ts-0.1.1.tgz#70b09b83f43df5172d0205a63025bce0f7357fa0"
98029790
integrity sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g==
98039791

9804-
[email protected], micromatch@^4.0.0, micromatch@^4.0.2:
9805-
version "4.0.2"
9806-
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
9807-
integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
9808-
dependencies:
9809-
braces "^3.0.1"
9810-
picomatch "^2.0.5"
9811-
98129792
micromatch@^3.1.10, micromatch@^3.1.4:
98139793
version "3.1.10"
98149794
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -9828,6 +9808,14 @@ micromatch@^3.1.10, micromatch@^3.1.4:
98289808
snapdragon "^0.8.1"
98299809
to-regex "^3.0.2"
98309810

9811+
micromatch@^4.0.0, micromatch@^4.0.2:
9812+
version "4.0.2"
9813+
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
9814+
integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
9815+
dependencies:
9816+
braces "^3.0.1"
9817+
picomatch "^2.0.5"
9818+
98319819
miller-rabin@^4.0.0:
98329820
version "4.0.1"
98339821
resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -10005,11 +9993,6 @@ mixin-object@^2.0.1:
100059993
for-in "^0.1.3"
100069994
is-extendable "^0.1.1"
100079995

10008-
[email protected]:
10009-
version "1.0.4"
10010-
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
10011-
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
10012-
100139996
mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@~0.5.0, mkdirp@~0.5.1:
100149997
version "0.5.5"
100159998
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
@@ -12821,16 +12804,16 @@ [email protected]:
1282112804
resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz#e4345ce73071c53f336445cfc19efb1c311df2a6"
1282212805
integrity sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==
1282312806

12824-
[email protected], semver@^7.1.2, semver@^7.2.1, semver@^7.3.2:
12825-
version "7.3.2"
12826-
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
12827-
integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
12828-
1282912807
semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.3.0:
1283012808
version "6.3.0"
1283112809
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
1283212810
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
1283312811

12812+
semver@^7.1.2, semver@^7.2.1, semver@^7.3.2:
12813+
version "7.3.2"
12814+
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
12815+
integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
12816+
1283412817
[email protected]:
1283512818
version "0.17.1"
1283612819
resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
@@ -14195,22 +14178,6 @@ ts-dedent@^1.1.0:
1419514178
resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-1.1.1.tgz#68fad040d7dbd53a90f545b450702340e17d18f3"
1419614179
integrity sha512-UGTRZu1evMw4uTPyYF66/KFd22XiU+jMaIuHrkIHQ2GivAXVlLV0v/vHrpOuTRf9BmpNHi/SO7Vd0rLu0y57jg==
1419714180

14198-
[email protected]:
14199-
version "26.1.0"
14200-
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.1.0.tgz#e9070fc97b3ea5557a48b67c631c74eb35e15417"
14201-
integrity sha512-JbhQdyDMYN5nfKXaAwCIyaWLGwevcT2/dbqRPsQeh6NZPUuXjZQZEfeLb75tz0ubCIgEELNm6xAzTe5NXs5Y4Q==
14202-
dependencies:
14203-
bs-logger "0.x"
14204-
buffer-from "1.x"
14205-
fast-json-stable-stringify "2.x"
14206-
json5 "2.x"
14207-
lodash.memoize "4.x"
14208-
make-error "1.x"
14209-
micromatch "4.x"
14210-
mkdirp "1.x"
14211-
semver "7.x"
14212-
yargs-parser "18.x"
14213-
1421414181
ts-pnp@^1.1.2:
1421514182
version "1.2.0"
1421614183
resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
@@ -15143,21 +15110,21 @@ yaml@^1.7.2:
1514315110
dependencies:
1514415111
"@babel/runtime" "^7.9.2"
1514515112

15146-
[email protected], yargs-parser@^18.1.1:
15147-
version "18.1.3"
15148-
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
15149-
integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
15150-
dependencies:
15151-
camelcase "^5.0.0"
15152-
decamelize "^1.2.0"
15153-
1515415113
yargs-parser@^10.0.0:
1515515114
version "10.1.0"
1515615115
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
1515715116
integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
1515815117
dependencies:
1515915118
camelcase "^4.1.0"
1516015119

15120+
yargs-parser@^18.1.1:
15121+
version "18.1.3"
15122+
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
15123+
integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
15124+
dependencies:
15125+
camelcase "^5.0.0"
15126+
decamelize "^1.2.0"
15127+
1516115128
yargs-parser@^7.0.0:
1516215129
version "7.0.0"
1516315130
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"

0 commit comments

Comments
 (0)