Skip to content
This repository was archived by the owner on May 24, 2022. It is now read-only.

Commit a6c4f7f

Browse files
committed
build: update jest-utils
1 parent e6af578 commit a6c4f7f

File tree

5 files changed

+53
-55
lines changed

5 files changed

+53
-55
lines changed

.editorconfig

+3-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ root = true
33

44
[*]
55
charset = utf-8
6+
indent_size = 4
7+
end_of_line = lf
68
indent_style = space
7-
indent_size = 2
9+
max_line_length = 120
810
insert_final_newline = true
911
trim_trailing_whitespace = true
10-
11-
[*.md]
12-
max_line_length = off
13-
trim_trailing_whitespace = false

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,4 @@ testem.log
3838
.DS_Store
3939
Thumbs.db
4040
.eslintcache
41+
.cache

jest.config.js

+10-26
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,14 @@
1+
const { createTsJestConfig } = require('@angular-ru/jest-utils');
12
const path = require('path');
2-
const { pathsToModuleNameMapper: resolver } = require('ts-jest/utils');
3-
const { compilerOptions } = require('./tsconfig.json');
43

5-
const moduleNameMapper = resolver(compilerOptions.paths, { prefix: '<rootDir>/' });
6-
7-
module.exports = {
8-
verbose: true,
9-
watch: false,
10-
cache: false,
11-
maxWorkers: 1,
12-
maxConcurrency: 1,
13-
preset: 'jest-preset-angular',
4+
module.exports = createTsJestConfig({
5+
maxWorkers: 2,
6+
maxConcurrency: 2,
7+
displayName: '@ngxs-labs/data',
148
rootDir: path.resolve('.'),
15-
testMatch: ['<rootDir>/**/*.spec.ts'],
16-
collectCoverageFrom: ['<rootDir>/lib/**/*.ts'],
17-
setupFilesAfterEnv: ['<rootDir>/setupJest.ts'],
18-
coverageReporters: ['json', 'lcovonly', 'lcov', 'text', 'html'],
19-
coveragePathIgnorePatterns: ['/node_modules/'],
20-
globals: {
21-
'ts-jest': {
22-
tsConfig: '<rootDir>/tsconfig.json',
23-
allowSyntheticDefaultImports: true
24-
}
25-
},
26-
bail: true,
27-
moduleNameMapper,
289
modulePathIgnorePatterns: ['<rootDir>/dist/'],
29-
modulePaths: ['<rootDir>']
30-
};
10+
setupFilesAfterEnv: ['<rootDir>/setupJest.ts'],
11+
collectCoverageFrom: ['<rootDir>/lib/**/*.ts'],
12+
testMatch: ['<rootDir>/integration/tests/**/*.spec.ts'],
13+
tsConfigRootPath: path.resolve('./tsconfig.json')
14+
});

package.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"devDependencies": {
2020
"@angular-devkit/build-angular": "0.803.26",
2121
"@angular-ru/eslint-config": "12.5.0",
22+
"@angular-ru/jest-utils": "12.8.0",
2223
"@angular-ru/prettier-config": "12.7.0",
2324
"@angular-ru/tsconfig": "12.1.0",
2425
"@angular/animations": "8.2.14",
@@ -36,16 +37,13 @@
3637
"@angular/router": "8.2.14",
3738
"@ngxs/logger-plugin": "3.6.2",
3839
"@ngxs/store": "3.6.2",
39-
"@types/jest": "25.2.1",
4040
"@types/node": "13.13.4",
4141
"angular-cli-ghpages": "0.6.2",
4242
"core-js": "3.6.5",
4343
"coveralls": "3.1.0",
4444
"dtslint": "3.5.1",
4545
"eslint": "6.8.0",
4646
"hammerjs": "2.0.8",
47-
"jest": "25.5.4",
48-
"jest-preset-angular": "8.1.3",
4947
"ng-packagr": "9.1.2",
5048
"npx": "10.2.2",
5149
"rxjs": "6.5.5",

yarn.lock

+38-21
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,16 @@
131131
tslint-eslint-rules "5.4.0"
132132
tslint-sonarts "1.9.0"
133133

134+
"@angular-ru/[email protected]":
135+
version "12.8.0"
136+
resolved "https://registry.npmjs.org/@angular-ru/jest-utils/-/jest-utils-12.8.0.tgz#620e23f4e484e1d6e1bef70ddf1f16589c3d40c3"
137+
integrity sha512-cwiAGd+lN0XatZqwgv2dQgWKbN2rDM024vAZpdFO0C5t3FP6IkTrZgaqUiuvpVhQ/XagWFQE3P3L0QrAsNNTTw==
138+
dependencies:
139+
"@types/jest" "25.2.1"
140+
jest "25.5.4"
141+
jest-preset-angular "8.1.3"
142+
ts-jest "25.4.0"
143+
134144
"@angular-ru/[email protected]":
135145
version "12.7.0"
136146
resolved "https://registry.npmjs.org/@angular-ru/prettier-config/-/prettier-config-12.7.0.tgz#0d6fe4b0d58df61d8474431f84568aa28c47864a"
@@ -1325,13 +1335,13 @@
13251335
resolve "^1.14.2"
13261336

13271337
"@rollup/pluginutils@^3.0.1", "@rollup/pluginutils@^3.0.8":
1328-
version "3.0.9"
1329-
resolved "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.9.tgz#aa6adca2c45e5a1b950103a999e3cddfe49fd775"
1330-
integrity sha512-TLZavlfPAZYI7v33wQh4mTP6zojne14yok3DNSLcjoG/Hirxfkonn6icP5rrNWRn8nZsirJBFFpijVOJzkUHDg==
1338+
version "3.0.10"
1339+
resolved "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.10.tgz#a659b9025920378494cd8f8c59fbf9b3a50d5f12"
1340+
integrity sha512-d44M7t+PjmMrASHbhgpSbVgtL6EFyX7J4mYxwQ/c5eoaE6N2VgCgEcWVzNnwycIloti+/MpwFr8qfw+nRw00sw==
13311341
dependencies:
13321342
"@types/estree" "0.0.39"
13331343
estree-walker "^1.0.1"
1334-
micromatch "^4.0.2"
1344+
picomatch "^2.2.2"
13351345

13361346
"@schematics/[email protected]":
13371347
version "8.3.26"
@@ -3995,9 +4005,9 @@ [email protected]:
39954005
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
39964006

39974007
electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.413:
3998-
version "1.3.426"
3999-
resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.426.tgz#d7301de9e40df83a40fe1f51b4463cfe170d1153"
4000-
integrity sha512-sdQ7CXQbFflKY5CU63ra+kIYq9F7d1OqI33856qJZxTrwo0sLASdmoRl9lWpGrQDS9Nk/RFliQWd3PPDrZ+Meg==
4008+
version "1.3.427"
4009+
resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz#ea43d02908a8c71f47ebb46e09de5a3cf8236f04"
4010+
integrity sha512-/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A==
40014011

40024012
elliptic@^6.0.0:
40034013
version "6.5.2"
@@ -5917,6 +5927,11 @@ is-directory@^0.3.1:
59175927
resolved "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
59185928
integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
59195929

5930+
is-docker@^2.0.0:
5931+
version "2.0.0"
5932+
resolved "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz#2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b"
5933+
integrity sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==
5934+
59205935
is-extendable@^0.1.0, is-extendable@^0.1.1:
59215936
version "0.1.1"
59225937
resolved "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -6133,9 +6148,11 @@ is-wsl@^1.1.0:
61336148
integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
61346149

61356150
is-wsl@^2.1.1:
6136-
version "2.1.1"
6137-
resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz#4a1c152d429df3d441669498e2486d3596ebaf1d"
6138-
integrity sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==
6151+
version "2.2.0"
6152+
resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
6153+
integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
6154+
dependencies:
6155+
is-docker "^2.0.0"
61396156

61406157
is-yarn-global@^0.3.0:
61416158
version "0.3.0"
@@ -7313,9 +7330,9 @@ [email protected], mime@^1.4.1:
73137330
integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
73147331

73157332
mime@^2.3.1, mime@^2.4.4:
7316-
version "2.4.4"
7317-
resolved "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
7318-
integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
7333+
version "2.4.5"
7334+
resolved "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz#d8de2ecb92982dedbb6541c9b6841d7f218ea009"
7335+
integrity sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==
73197336

73207337
mimic-fn@^2.0.0, mimic-fn@^2.1.0:
73217338
version "2.1.0"
@@ -8542,7 +8559,7 @@ performance-now@^2.1.0:
85428559
resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
85438560
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
85448561

8545-
picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
8562+
picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1, picomatch@^2.2.2:
85468563
version "2.2.2"
85478564
resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
85488565
integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
@@ -8694,9 +8711,9 @@ [email protected]:
86948711
supports-color "^6.1.0"
86958712

86968713
postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.17, postcss@^7.0.18, postcss@^7.0.2, postcss@^7.0.27:
8697-
version "7.0.27"
8698-
resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz#cc67cdc6b0daa375105b7c424a85567345fc54d9"
8699-
integrity sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==
8714+
version "7.0.28"
8715+
resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.28.tgz#d349ced7743475717ba91f6810efb58c51fb5dbb"
8716+
integrity sha512-YU6nVhyWIsVtlNlnAj1fHTsUKW5qxm3KEgzq2Jj6KTEFOTK8QWR12eIDvrlWhiSTK8WIBFTBhOJV4DY6dUuEbw==
87008717
dependencies:
87018718
chalk "^2.4.2"
87028719
source-map "^0.6.1"
@@ -10815,7 +10832,7 @@ trim-repeated@^1.0.0:
1081510832
dependencies:
1081610833
escape-string-regexp "^1.0.2"
1081710834

10818-
ts-jest@^25.0.0:
10835+
ts-jest@25.4.0, ts-jest@^25.0.0:
1081910836
version "25.4.0"
1082010837
resolved "https://registry.npmjs.org/ts-jest/-/ts-jest-25.4.0.tgz#5ad504299f8541d463a52e93e5e9d76876be0ba4"
1082110838
integrity sha512-+0ZrksdaquxGUBwSdTIcdX7VXdwLIlSRsyjivVA9gcO+Cvr6ByqDhu/mi5+HCcb6cMkiQp5xZ8qRO7/eCqLeyw==
@@ -11016,9 +11033,9 @@ [email protected], typescript@^3.7.5:
1101611033
integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
1101711034

1101811035
typescript@next:
11019-
version "4.0.0-dev.20200501"
11020-
resolved "https://registry.npmjs.org/typescript/-/typescript-4.0.0-dev.20200501.tgz#9a54727bd719102d947a5ecf584ccc985dccb94b"
11021-
integrity sha512-RQvw3/R3//3hNxzeTJ4sbiuX9qjrpoIU6VxD+QquHHaJXf67P3yfIcV9hNFqd2QvrUiFPGM3KN08ahWkEN56bA==
11036+
version "4.0.0-dev.20200503"
11037+
resolved "https://registry.npmjs.org/typescript/-/typescript-4.0.0-dev.20200503.tgz#9bae63a18294b9ea88d9cf63dd4b0c52e7ae7077"
11038+
integrity sha512-wqfrGY1YU6Zzyy8BVFNuD7LoBlXfPgrDbgmGzSpOWLIe4qHSWNKh5mLs/CCurW/VHTNc683UjWhjU7Pfbguhvg==
1102211039

1102311040
1102411041
version "0.0.6"

0 commit comments

Comments
 (0)