diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz index 89e1783..0a7d847 100644 Binary files a/.yarn/install-state.gz and b/.yarn/install-state.gz differ diff --git a/configs/jest/__mocks__/fileMock.js b/configs/jest/__mocks__/fileMock.js deleted file mode 100644 index 86059f3..0000000 --- a/configs/jest/__mocks__/fileMock.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = 'test-file-stub'; diff --git a/configs/jest/__mocks__/fileMock.ts b/configs/jest/__mocks__/fileMock.ts new file mode 100644 index 0000000..602eb23 --- /dev/null +++ b/configs/jest/__mocks__/fileMock.ts @@ -0,0 +1 @@ +export default 'test-file-stub'; diff --git a/configs/jest/babel-jest.config.js b/configs/jest/babel-jest.config.js deleted file mode 100644 index b5926f6..0000000 --- a/configs/jest/babel-jest.config.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = { - presets: [ - '@babel/preset-typescript', - '@babel/preset-env', - ['@babel/preset-react', { - runtime: 'automatic', - }], - ], -}; diff --git a/configs/jest/setupTests.js b/configs/jest/setupTests.ts similarity index 100% rename from configs/jest/setupTests.js rename to configs/jest/setupTests.ts diff --git a/jest.config.js b/jest.config.js deleted file mode 100644 index e395280..0000000 --- a/jest.config.js +++ /dev/null @@ -1,18 +0,0 @@ -module.exports = { - testEnvironment: 'jsdom', - transform: { - '\\.[j|t]sx?$': ['babel-jest', { - configFile: './configs/jest/babel-jest.config.js', - }], - }, - setupFilesAfterEnv: ['./configs/jest/setupTests.js'], - modulePaths: ['src'], - moduleNameMapper: { - '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': - './configs/jest/__mocks__/fileMock.js', - '\\.(css|less|scss)$': 'identity-obj-proxy', - }, - transformIgnorePatterns: [ - '/node_modules/(?!react-dnd|dnd-core|@react-dnd|react-dnd-html5-backend)', - ], -}; diff --git a/jest.config.ts b/jest.config.ts new file mode 100644 index 0000000..99cfb5d --- /dev/null +++ b/jest.config.ts @@ -0,0 +1,23 @@ +import type { Config } from 'jest'; + +const config: Config = { + clearMocks: true, + testEnvironment: 'jsdom', + coverageDirectory: 'coverage', + setupFilesAfterEnv: ['./configs/jest/setupTests.ts'], + modulePaths: [ + 'src', + ], + verbose: true, + preset: 'ts-jest/presets/js-with-ts', + moduleNameMapper: { + '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': + './configs/jest/__mocks__/fileMock.ts', + '\\.(css|less|scss)$': 'identity-obj-proxy', + }, + transformIgnorePatterns: [ + 'node_modules/(?!react-dnd|dnd-core|@react-dnd|react-dnd-html5-backend)', + ], +}; + +export default config; diff --git a/offline_node_modules/@remix-run-router-npm-1.15.3-68c33b33e6-aea197447c.zip b/offline_node_modules/@remix-run-router-npm-1.15.3-68c33b33e6-aea197447c.zip deleted file mode 100644 index 45e3a02..0000000 Binary files a/offline_node_modules/@remix-run-router-npm-1.15.3-68c33b33e6-aea197447c.zip and /dev/null differ diff --git a/offline_node_modules/@remix-run-router-npm-1.16.1-cfa8039af0-5f1b0aef49.zip b/offline_node_modules/@remix-run-router-npm-1.16.1-cfa8039af0-5f1b0aef49.zip new file mode 100644 index 0000000..f5fee8c Binary files /dev/null and b/offline_node_modules/@remix-run-router-npm-1.16.1-cfa8039af0-5f1b0aef49.zip differ diff --git a/offline_node_modules/bs-logger-npm-0.2.6-7670f88b66-80e89aaaed.zip b/offline_node_modules/bs-logger-npm-0.2.6-7670f88b66-80e89aaaed.zip new file mode 100644 index 0000000..3ae6435 Binary files /dev/null and b/offline_node_modules/bs-logger-npm-0.2.6-7670f88b66-80e89aaaed.zip differ diff --git a/offline_node_modules/react-dom-npm-18.2.0-dd675bca1c-66dfc5f93e.zip b/offline_node_modules/react-dom-npm-18.3.1-a805663f38-a752496c19.zip similarity index 94% rename from offline_node_modules/react-dom-npm-18.2.0-dd675bca1c-66dfc5f93e.zip rename to offline_node_modules/react-dom-npm-18.3.1-a805663f38-a752496c19.zip index 00e68be..7dd5bab 100644 Binary files a/offline_node_modules/react-dom-npm-18.2.0-dd675bca1c-66dfc5f93e.zip and b/offline_node_modules/react-dom-npm-18.3.1-a805663f38-a752496c19.zip differ diff --git a/offline_node_modules/react-npm-18.2.0-1eae08fee2-b562d9b569.zip b/offline_node_modules/react-npm-18.3.1-af38f3c1ae-283e8c5efc.zip similarity index 93% rename from offline_node_modules/react-npm-18.2.0-1eae08fee2-b562d9b569.zip rename to offline_node_modules/react-npm-18.3.1-af38f3c1ae-283e8c5efc.zip index ca9f05a..486442f 100644 Binary files a/offline_node_modules/react-npm-18.2.0-1eae08fee2-b562d9b569.zip and b/offline_node_modules/react-npm-18.3.1-af38f3c1ae-283e8c5efc.zip differ diff --git a/offline_node_modules/react-router-dom-npm-6.22.3-a471ae53e5-39b0472db5.zip b/offline_node_modules/react-router-dom-npm-6.22.3-a471ae53e5-39b0472db5.zip deleted file mode 100644 index 64c5a36..0000000 Binary files a/offline_node_modules/react-router-dom-npm-6.22.3-a471ae53e5-39b0472db5.zip and /dev/null differ diff --git a/offline_node_modules/react-router-dom-npm-6.23.1-a0a4fb9537-01b954d7d0.zip b/offline_node_modules/react-router-dom-npm-6.23.1-a0a4fb9537-01b954d7d0.zip new file mode 100644 index 0000000..734456b Binary files /dev/null and b/offline_node_modules/react-router-dom-npm-6.23.1-a0a4fb9537-01b954d7d0.zip differ diff --git a/offline_node_modules/react-router-npm-6.22.3-2497e3de73-a2c85c3d1f.zip b/offline_node_modules/react-router-npm-6.23.1-793f9d0865-0919498057.zip similarity index 54% rename from offline_node_modules/react-router-npm-6.22.3-2497e3de73-a2c85c3d1f.zip rename to offline_node_modules/react-router-npm-6.23.1-793f9d0865-0919498057.zip index 7fd7110..e320168 100644 Binary files a/offline_node_modules/react-router-npm-6.22.3-2497e3de73-a2c85c3d1f.zip and b/offline_node_modules/react-router-npm-6.23.1-793f9d0865-0919498057.zip differ diff --git a/offline_node_modules/scheduler-npm-0.23.0-a379a6bc3b-b777f7ca01.zip b/offline_node_modules/scheduler-npm-0.23.2-6d1dd9c2b7-26383305e2.zip similarity index 99% rename from offline_node_modules/scheduler-npm-0.23.0-a379a6bc3b-b777f7ca01.zip rename to offline_node_modules/scheduler-npm-0.23.2-6d1dd9c2b7-26383305e2.zip index 903e989..ece2f30 100644 Binary files a/offline_node_modules/scheduler-npm-0.23.0-a379a6bc3b-b777f7ca01.zip and b/offline_node_modules/scheduler-npm-0.23.2-6d1dd9c2b7-26383305e2.zip differ diff --git a/offline_node_modules/ts-jest-npm-29.1.4-b7c081a1e2-97def10be2.zip b/offline_node_modules/ts-jest-npm-29.1.4-b7c081a1e2-97def10be2.zip new file mode 100644 index 0000000..4b27c78 Binary files /dev/null and b/offline_node_modules/ts-jest-npm-29.1.4-b7c081a1e2-97def10be2.zip differ diff --git a/package.json b/package.json index 3b080f6..7bdac98 100644 --- a/package.json +++ b/package.json @@ -34,17 +34,13 @@ "classnames": "2.5.1", "normalize.css": "8.0.1", "prop-types": "15.8.1", - "react": "18.2.0", - "react-dnd": "^16.0.1", - "react-dnd-html5-backend": "^16.0.1", - "react-dom": "18.2.0", - "react-router-dom": "6.22.3" + "react": "18.3.1", + "react-dnd": "16.0.1", + "react-dnd-html5-backend": "16.0.1", + "react-dom": "18.3.1", + "react-router-dom": "6.23.1" }, "devDependencies": { - "@babel/core": "7.24.3", - "@babel/preset-env": "7.24.3", - "@babel/preset-react": "7.24.1", - "@babel/preset-typescript": "7.24.1", "@commitlint/cli": "19.2.1", "@commitlint/config-conventional": "19.1.0", "@testing-library/jest-dom": "6.4.2", @@ -61,6 +57,7 @@ "ksv741-react-scripts": "0.3.1", "lint-staged": "15.2.2", "standard-version": "9.5.0", + "ts-jest": "29.1.4", "typescript": "5.4.5" }, "packageManager": "yarn@4.1.1" diff --git a/tsconfig.json b/tsconfig.json index 20888c7..27e1d1e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,8 @@ { "include": [ "./src", - "./configs" + "./configs", + "./jest.config.ts" ], "compilerOptions": { "allowUnreachableCode": false, @@ -24,18 +25,15 @@ "useUnknownInCatchVariables": true, "allowArbitraryExtensions": true, - "allowImportingTsExtensions": true, "allowUmdGlobalAccess": true, "module": "ESNext", - "moduleResolution": "Bundler", + "moduleResolution": "Node", "paths": { "*": ["./src/*"] }, "resolveJsonModule": true, - "resolvePackageJsonExports": true, - "resolvePackageJsonImports": true, "noEmit": true, "noEmitOnError": true, "preserveConstEnums": true, diff --git a/yarn.lock b/yarn.lock index 819c98c..46ede99 100644 --- a/yarn.lock +++ b/yarn.lock @@ -69,7 +69,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:7.24.3, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.21.3, @babel/core@npm:^7.23.9": +"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.21.3, @babel/core@npm:^7.23.9": version: 7.24.3 resolution: "@babel/core@npm:7.24.3" dependencies: @@ -1409,7 +1409,7 @@ __metadata: languageName: node linkType: hard -"@babel/preset-env@npm:7.24.3, @babel/preset-env@npm:^7.20.2": +"@babel/preset-env@npm:^7.20.2": version: 7.24.3 resolution: "@babel/preset-env@npm:7.24.3" dependencies: @@ -1528,7 +1528,7 @@ __metadata: languageName: node linkType: hard -"@babel/preset-react@npm:7.24.1, @babel/preset-react@npm:^7.18.6": +"@babel/preset-react@npm:^7.18.6": version: 7.24.1 resolution: "@babel/preset-react@npm:7.24.1" dependencies: @@ -1559,7 +1559,7 @@ __metadata: languageName: node linkType: hard -"@babel/preset-typescript@npm:7.24.1, @babel/preset-typescript@npm:^7.21.0": +"@babel/preset-typescript@npm:^7.21.0": version: 7.24.1 resolution: "@babel/preset-typescript@npm:7.24.1" dependencies: @@ -2972,10 +2972,10 @@ __metadata: languageName: node linkType: hard -"@remix-run/router@npm:1.15.3": - version: 1.15.3 - resolution: "@remix-run/router@npm:1.15.3" - checksum: 10c0/aea197447cee21e137d70f0c93e00de70c64fcfae20ae349ade9dc4202e782bd94dbc88be7302d13b6aa6cde38a701b074cd8e09a161d14cecda832a36dd2695 +"@remix-run/router@npm:1.16.1": + version: 1.16.1 + resolution: "@remix-run/router@npm:1.16.1" + checksum: 10c0/5f1b0aef4924830eeab9c86dcaa5af8157066e5de65b449e7fdf406532b2384828a46a447c31b0735fd713a06938dd88bfd4e566d9989be70c770457dda16c92 languageName: node linkType: hard @@ -5108,6 +5108,15 @@ __metadata: languageName: node linkType: hard +"bs-logger@npm:0.x": + version: 0.2.6 + resolution: "bs-logger@npm:0.2.6" + dependencies: + fast-json-stable-stringify: "npm:2.x" + checksum: 10c0/80e89aaaed4b68e3374ce936f2eb097456a0dddbf11f75238dbd53140b1e39259f0d248a5089ed456f1158984f22191c3658d54a713982f676709fbe1a6fa5a0 + languageName: node + linkType: hard + "bser@npm:2.1.1": version: 2.1.1 resolution: "bser@npm:2.1.1" @@ -7741,7 +7750,7 @@ __metadata: languageName: node linkType: hard -"fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0": +"fast-json-stable-stringify@npm:2.x, fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0": version: 2.1.0 resolution: "fast-json-stable-stringify@npm:2.1.0" checksum: 10c0/7f081eb0b8a64e0057b3bb03f974b3ef00135fbf36c1c710895cd9300f13c94ba809bb3a81cf4e1b03f6e5285610a61abbd7602d0652de423144dfee5a389c9b @@ -9864,7 +9873,7 @@ __metadata: languageName: node linkType: hard -"jest-util@npm:^29.7.0": +"jest-util@npm:^29.0.0, jest-util@npm:^29.7.0": version: 29.7.0 resolution: "jest-util@npm:29.7.0" dependencies: @@ -10443,7 +10452,7 @@ __metadata: languageName: node linkType: hard -"lodash.memoize@npm:^4.1.2": +"lodash.memoize@npm:4.x, lodash.memoize@npm:^4.1.2": version: 4.1.2 resolution: "lodash.memoize@npm:4.1.2" checksum: 10c0/c8713e51eccc650422716a14cece1809cfe34bc5ab5e242b7f8b4e2241c2483697b971a604252807689b9dd69bfe3a98852e19a5b89d506b000b4187a1285df8 @@ -10575,7 +10584,7 @@ __metadata: languageName: node linkType: hard -"make-error@npm:^1.1.1": +"make-error@npm:1.x, make-error@npm:^1.1.1": version: 1.3.6 resolution: "make-error@npm:1.3.6" checksum: 10c0/171e458d86854c6b3fc46610cfacf0b45149ba043782558c6875d9f42f222124384ad0b468c92e996d815a8a2003817a710c0a160e49c1c394626f76fa45396f @@ -10939,10 +10948,6 @@ __metadata: version: 0.0.0-use.local resolution: "money-controll-frontend-app@workspace:." dependencies: - "@babel/core": "npm:7.24.3" - "@babel/preset-env": "npm:7.24.3" - "@babel/preset-react": "npm:7.24.1" - "@babel/preset-typescript": "npm:7.24.1" "@commitlint/cli": "npm:19.2.1" "@commitlint/config-conventional": "npm:19.1.0" "@testing-library/jest-dom": "npm:6.4.2" @@ -10961,12 +10966,13 @@ __metadata: lint-staged: "npm:15.2.2" normalize.css: "npm:8.0.1" prop-types: "npm:15.8.1" - react: "npm:18.2.0" - react-dnd: "npm:^16.0.1" - react-dnd-html5-backend: "npm:^16.0.1" - react-dom: "npm:18.2.0" - react-router-dom: "npm:6.22.3" + react: "npm:18.3.1" + react-dnd: "npm:16.0.1" + react-dnd-html5-backend: "npm:16.0.1" + react-dom: "npm:18.3.1" + react-router-dom: "npm:6.23.1" standard-version: "npm:9.5.0" + ts-jest: "npm:29.1.4" typescript: "npm:5.4.5" languageName: unknown linkType: soft @@ -12700,7 +12706,7 @@ __metadata: languageName: node linkType: hard -"react-dnd-html5-backend@npm:^16.0.1": +"react-dnd-html5-backend@npm:16.0.1": version: 16.0.1 resolution: "react-dnd-html5-backend@npm:16.0.1" dependencies: @@ -12709,7 +12715,7 @@ __metadata: languageName: node linkType: hard -"react-dnd@npm:^16.0.1": +"react-dnd@npm:16.0.1": version: 16.0.1 resolution: "react-dnd@npm:16.0.1" dependencies: @@ -12734,15 +12740,15 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:18.2.0": - version: 18.2.0 - resolution: "react-dom@npm:18.2.0" +"react-dom@npm:18.3.1": + version: 18.3.1 + resolution: "react-dom@npm:18.3.1" dependencies: loose-envify: "npm:^1.1.0" - scheduler: "npm:^0.23.0" + scheduler: "npm:^0.23.2" peerDependencies: - react: ^18.2.0 - checksum: 10c0/66dfc5f93e13d0674e78ef41f92ed21dfb80f9c4ac4ac25a4b51046d41d4d2186abc915b897f69d3d0ebbffe6184e7c5876f2af26bfa956f179225d921be713a + react: ^18.3.1 + checksum: 10c0/a752496c1941f958f2e8ac56239172296fcddce1365ce45222d04a1947e0cc5547df3e8447f855a81d6d39f008d7c32eab43db3712077f09e3f67c4874973e85 languageName: node linkType: hard @@ -12774,36 +12780,36 @@ __metadata: languageName: node linkType: hard -"react-router-dom@npm:6.22.3": - version: 6.22.3 - resolution: "react-router-dom@npm:6.22.3" +"react-router-dom@npm:6.23.1": + version: 6.23.1 + resolution: "react-router-dom@npm:6.23.1" dependencies: - "@remix-run/router": "npm:1.15.3" - react-router: "npm:6.22.3" + "@remix-run/router": "npm:1.16.1" + react-router: "npm:6.23.1" peerDependencies: react: ">=16.8" react-dom: ">=16.8" - checksum: 10c0/39b0472db5d153cbbbf4f5df5c0b26f2b75ffd7b857d7b67d17e03f4618d806b957cf033fbeb265bb317ade951e6ce0d576311bdf6eb15a7013203079cfadf03 + checksum: 10c0/01b954d7d0ff4c53bb2edbc816458f3fad1ce9ee49a4dfdc5c866065c23026c9cce429b46b754cbaebb83b22cfe5f605bbf441acf515e3c377cbdf021b0bec4c languageName: node linkType: hard -"react-router@npm:6.22.3": - version: 6.22.3 - resolution: "react-router@npm:6.22.3" +"react-router@npm:6.23.1": + version: 6.23.1 + resolution: "react-router@npm:6.23.1" dependencies: - "@remix-run/router": "npm:1.15.3" + "@remix-run/router": "npm:1.16.1" peerDependencies: react: ">=16.8" - checksum: 10c0/a2c85c3d1fa93585e312b1f7e6e21d1ca421875013a8d879e109d3ed41fb035bc93faef4cd42b354ea18d039bc50b679bf752679ad83ac26a986e3432fbd0462 + checksum: 10c0/091949805745136350ab049b2a96281bf38742c9d3651019fb48ea79c5eafbfb0379f1d3e636602dd56b0ef278389e8fd25be983dc2c0ffd1103d06dfa8019f3 languageName: node linkType: hard -"react@npm:18.2.0": - version: 18.2.0 - resolution: "react@npm:18.2.0" +"react@npm:18.3.1": + version: 18.3.1 + resolution: "react@npm:18.3.1" dependencies: loose-envify: "npm:^1.1.0" - checksum: 10c0/b562d9b569b0cb315e44b48099f7712283d93df36b19a39a67c254c6686479d3980b7f013dc931f4a5a3ae7645eae6386b4aa5eea933baa54ecd0f9acb0902b8 + checksum: 10c0/283e8c5efcf37802c9d1ce767f302dd569dd97a70d9bb8c7be79a789b9902451e0d16334b05d73299b20f048cbc3c7d288bbbde10b701fa194e2089c237dbea3 languageName: node linkType: hard @@ -13303,12 +13309,12 @@ __metadata: languageName: node linkType: hard -"scheduler@npm:^0.23.0": - version: 0.23.0 - resolution: "scheduler@npm:0.23.0" +"scheduler@npm:^0.23.2": + version: 0.23.2 + resolution: "scheduler@npm:0.23.2" dependencies: loose-envify: "npm:^1.1.0" - checksum: 10c0/b777f7ca0115e6d93e126ac490dbd82642d14983b3079f58f35519d992fa46260be7d6e6cede433a92db70306310c6f5f06e144f0e40c484199e09c1f7be53dd + checksum: 10c0/26383305e249651d4c58e6705d5f8425f153211aef95f15161c151f7b8de885f24751b377e4a0b3dd42cce09aad3f87a61dab7636859c0d89b7daf1a1e2a5c78 languageName: node linkType: hard @@ -14349,6 +14355,42 @@ __metadata: languageName: node linkType: hard +"ts-jest@npm:29.1.4": + version: 29.1.4 + resolution: "ts-jest@npm:29.1.4" + dependencies: + bs-logger: "npm:0.x" + fast-json-stable-stringify: "npm:2.x" + jest-util: "npm:^29.0.0" + json5: "npm:^2.2.3" + lodash.memoize: "npm:4.x" + make-error: "npm:1.x" + semver: "npm:^7.5.3" + yargs-parser: "npm:^21.0.1" + peerDependencies: + "@babel/core": ">=7.0.0-beta.0 <8" + "@jest/transform": ^29.0.0 + "@jest/types": ^29.0.0 + babel-jest: ^29.0.0 + jest: ^29.0.0 + typescript: ">=4.3 <6" + peerDependenciesMeta: + "@babel/core": + optional: true + "@jest/transform": + optional: true + "@jest/types": + optional: true + babel-jest: + optional: true + esbuild: + optional: true + bin: + ts-jest: cli.js + checksum: 10c0/97def10be26a553e529dfacafe264fa9833d638052bc2b1ebe6301262ae2d3e43954f4d91f2d2d07cf92352cdd4fa163a86f8116a1f6bb8cef7060cddfec794b + languageName: node + linkType: hard + "ts-loader@npm:9.5.1": version: 9.5.1 resolution: "ts-loader@npm:9.5.1" @@ -15325,7 +15367,7 @@ __metadata: languageName: node linkType: hard -"yargs-parser@npm:^21.1.1": +"yargs-parser@npm:^21.0.1, yargs-parser@npm:^21.1.1": version: 21.1.1 resolution: "yargs-parser@npm:21.1.1" checksum: 10c0/f84b5e48169479d2f402239c59f084cfd1c3acc197a05c59b98bab067452e6b3ea46d4dd8ba2985ba7b3d32a343d77df0debd6b343e5dae3da2aab2cdf5886b2