From 90b20e9be4974031c97500636139344670914596 Mon Sep 17 00:00:00 2001 From: Dennis Kigen Date: Mon, 20 May 2024 12:28:25 +0300 Subject: [PATCH 1/3] (chore) Bump react and related types --- package.json | 24 +-- packages/esm-form-engine-app/package.json | 2 +- yarn.lock | 190 +++++++++++++++------- 3 files changed, 142 insertions(+), 74 deletions(-) diff --git a/package.json b/package.json index 195df02e07..712f9521f3 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,13 @@ "postinstall": "husky install", "test-e2e": "playwright test" }, + "dependencies": { + "@hookform/resolvers": "^3.3.1", + "classnames": "^2.3.2", + "react-hook-form": "^7.46.2", + "react-to-print": "^2.14.13", + "zod": "^3.22.2" + }, "devDependencies": { "@openmrs/esm-framework": "next", "@playwright/test": "1.44.0", @@ -28,8 +35,8 @@ "@types/fhir": "^0.0.31", "@types/jest": "^29.5.11", "@types/lodash-es": "^4.17.9", - "@types/react": "^18.2.22", - "@types/react-dom": "^18.2.7", + "@types/react": "^18.3.2", + "@types/react-dom": "^18.3.0", "@typescript-eslint/eslint-plugin": "^6.7.3", "@typescript-eslint/parser": "^6.7.3", "babel-preset-minify": "^0.5.2", @@ -53,8 +60,8 @@ "lodash": "^4.17.21", "openmrs": "next", "prettier": "^3.0.3", - "react": "^18.2.0", - "react-dom": "^18.2.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", "react-i18next": "^11.18.6", "react-router-dom": "^6.16.0", "rxjs": "^7.8.0", @@ -73,12 +80,5 @@ "resolutions": { "sass": "^1.54.3" }, - "packageManager": "yarn@4.2.2", - "dependencies": { - "@hookform/resolvers": "^3.3.1", - "classnames": "^2.3.2", - "react-hook-form": "^7.46.2", - "react-to-print": "^2.14.13", - "zod": "^3.22.2" - } + "packageManager": "yarn@4.2.2" } diff --git a/packages/esm-form-engine-app/package.json b/packages/esm-form-engine-app/package.json index 05c0236b2a..7e509d5c4a 100644 --- a/packages/esm-form-engine-app/package.json +++ b/packages/esm-form-engine-app/package.json @@ -38,7 +38,7 @@ }, "dependencies": { "@carbon/react": "^1.12.0", - "@openmrs/openmrs-form-engine-lib": "next", + "@openmrs/openmrs-form-engine-lib": "2.0.0-pre.1045", "lodash-es": "^4.17.21", "react-error-boundary": "^4.0.11" }, diff --git a/yarn.lock b/yarn.lock index 7c28c8c036..b28af76963 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2025,7 +2025,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.5, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.14.8, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.19.0, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.22.15, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": +"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.14.8, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.19.0, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.22.15, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": version: 7.24.0 resolution: "@babel/runtime@npm:7.24.0" dependencies: @@ -4050,7 +4050,7 @@ __metadata: dependencies: "@carbon/react": "npm:^1.12.0" "@openmrs/esm-patient-common-lib": "workspace:*" - "@openmrs/openmrs-form-engine-lib": "npm:next" + "@openmrs/openmrs-form-engine-lib": "npm:2.0.0-pre.1045" lodash-es: "npm:^4.17.21" react-error-boundary: "npm:^4.0.11" webpack: "npm:^5.88.2" @@ -4330,8 +4330,8 @@ __metadata: "@types/fhir": "npm:^0.0.31" "@types/jest": "npm:^29.5.11" "@types/lodash-es": "npm:^4.17.9" - "@types/react": "npm:^18.2.22" - "@types/react-dom": "npm:^18.2.7" + "@types/react": "npm:^18.3.2" + "@types/react-dom": "npm:^18.3.0" "@typescript-eslint/eslint-plugin": "npm:^6.7.3" "@typescript-eslint/parser": "npm:^6.7.3" babel-preset-minify: "npm:^0.5.2" @@ -4356,8 +4356,8 @@ __metadata: lodash: "npm:^4.17.21" openmrs: "npm:next" prettier: "npm:^3.0.3" - react: "npm:^18.2.0" - react-dom: "npm:^18.2.0" + react: "npm:^18.3.1" + react-dom: "npm:^18.3.1" react-hook-form: "npm:^7.46.2" react-i18next: "npm:^11.18.6" react-router-dom: "npm:^6.16.0" @@ -4760,31 +4760,31 @@ __metadata: languageName: node linkType: hard -"@openmrs/openmrs-form-engine-lib@npm:next": - version: 2.0.0-pre.1019 - resolution: "@openmrs/openmrs-form-engine-lib@npm:2.0.0-pre.1019" +"@openmrs/openmrs-form-engine-lib@npm:2.0.0-pre.1045": + version: 2.0.0-pre.1045 + resolution: "@openmrs/openmrs-form-engine-lib@npm:2.0.0-pre.1045" dependencies: - ace-builds: "npm:^1.4.12" + ace-builds: "npm:^1.33.2" classnames: "npm:^2.5.1" dayjs: "npm:1.x" - formik: "npm:^2.2.6" - lodash-es: "npm:^4.17.15" - react-error-boundary: "npm:^4.0.11" - react-markdown: "npm:^7.1.0" + formik: "npm:^2.4.6" + lodash-es: "npm:^4.17.21" + react-error-boundary: "npm:^4.0.13" + react-markdown: "npm:^7.1.2" react-waypoint: "npm:^10.3.0" - react-webcam: "npm:^7.1.1" - yup: "npm:^0.29.1" + react-webcam: "npm:^7.2.0" + yup: "npm:^1.4.0" peerDependencies: "@carbon/react": 1.x "@openmrs/esm-framework": 5.x - "@openmrs/esm-patient-common-lib": 7.x + "@openmrs/esm-patient-common-lib": 8.x dayjs: 1.x i18next: 23.x react: 18.x react-i18next: 11.x rxjs: 6.x swr: 2.x - checksum: 10/4beabe2db36f8d4143241f389e0c8feec7e213be3e786d3032507cb0aac307ce30ef2df551a550775cab563db0186605b33d55c80649ce6a643d56f83603d70f + checksum: 10/eadc5ffd025882fc749714aae9b26dc8947e4795fa44a441f905e6c43429d5006087c16c52a3cad179b38fab17578110fcc714405fa03f7e004b1f825ef4357a languageName: node linkType: hard @@ -6445,6 +6445,16 @@ __metadata: languageName: node linkType: hard +"@types/hoist-non-react-statics@npm:^3.3.1": + version: 3.3.5 + resolution: "@types/hoist-non-react-statics@npm:3.3.5" + dependencies: + "@types/react": "npm:*" + hoist-non-react-statics: "npm:^3.3.0" + checksum: 10/b645b062a20cce6ab1245ada8274051d8e2e0b2ee5c6bd58215281d0ec6dae2f26631af4e2e7c8abe238cdcee73fcaededc429eef569e70908f82d0cc0ea31d7 + languageName: node + linkType: hard + "@types/html-minifier-terser@npm:^6.0.0": version: 6.1.0 resolution: "@types/html-minifier-terser@npm:6.1.0" @@ -6662,7 +6672,7 @@ __metadata: languageName: node linkType: hard -"@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.2.7": +"@types/react-dom@npm:^18.0.0": version: 18.2.7 resolution: "@types/react-dom@npm:18.2.7" dependencies: @@ -6671,7 +6681,16 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*, @types/react@npm:^18.2.22": +"@types/react-dom@npm:^18.3.0": + version: 18.3.0 + resolution: "@types/react-dom@npm:18.3.0" + dependencies: + "@types/react": "npm:*" + checksum: 10/6ff53f5a7b7fba952a68e114d3b542ebdc1e87a794234785ebab0bcd9bde7fb4885f21ebaf93d26dc0a1b5b93287f42cad68b78ae04dddf6b20da7aceff0beaf + languageName: node + linkType: hard + +"@types/react@npm:*": version: 18.2.22 resolution: "@types/react@npm:18.2.22" dependencies: @@ -6682,6 +6701,16 @@ __metadata: languageName: node linkType: hard +"@types/react@npm:^18.3.2": + version: 18.3.2 + resolution: "@types/react@npm:18.3.2" + dependencies: + "@types/prop-types": "npm:*" + csstype: "npm:^3.0.2" + checksum: 10/a85eed82c1009dc9d979281d9ea1f5322255003de3378390f35d897b4bdaf1d34ea748636c03e9e9b4b7cc97c2f4582993d2d60e40846226ad497d97c7d8565a + languageName: node + linkType: hard + "@types/resolve@npm:1.17.1": version: 1.17.1 resolution: "@types/resolve@npm:1.17.1" @@ -7441,10 +7470,10 @@ __metadata: languageName: node linkType: hard -"ace-builds@npm:^1.4.12": - version: 1.16.0 - resolution: "ace-builds@npm:1.16.0" - checksum: 10/c845ca4c7b8ddcec5ad9b75ef75be778f96d96706bc74d1164a85367c4c20f34eb0d026a572f70e93b9a88fb2cd0c76ff74edfd627d6e89ae549eff7b5e9889a +"ace-builds@npm:^1.33.2": + version: 1.33.2 + resolution: "ace-builds@npm:1.33.2" + checksum: 10/0478efd91c3ef679ca0150b1ee7535da8a1f9bee3de26ff98432ab55482809ff1184e287dfaedc4d35462fce39053897b4fb6dbf7bf364084a50225aecaf5789 languageName: node linkType: hard @@ -12404,13 +12433,6 @@ __metadata: languageName: node linkType: hard -"fn-name@npm:~3.0.0": - version: 3.0.0 - resolution: "fn-name@npm:3.0.0" - checksum: 10/3cfe9bfadb65af582624fb17f8d491eac3d122ff8ecf9debb5994cb243131697b88903a737563cbc7d8a919716bd5f53ed8cb87bdfe124744a0d8a690531b4c2 - languageName: node - linkType: hard - "follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.15.0": version: 1.15.6 resolution: "follow-redirects@npm:1.15.6" @@ -12511,20 +12533,21 @@ __metadata: languageName: node linkType: hard -"formik@npm:^2.2.6": - version: 2.2.9 - resolution: "formik@npm:2.2.9" +"formik@npm:^2.4.6": + version: 2.4.6 + resolution: "formik@npm:2.4.6" dependencies: + "@types/hoist-non-react-statics": "npm:^3.3.1" deepmerge: "npm:^2.1.1" hoist-non-react-statics: "npm:^3.3.0" lodash: "npm:^4.17.21" lodash-es: "npm:^4.17.21" react-fast-compare: "npm:^2.0.1" tiny-warning: "npm:^1.0.2" - tslib: "npm:^1.10.0" + tslib: "npm:^2.0.0" peerDependencies: react: ">=16.8.0" - checksum: 10/c7b4c6ee9cc8256302c56106fa4ff1a86b48774b26e5cdd4fe5a40d5ae2171ed7a02714cd36fa7fb05d8b86c5471643339a69d6e3f4234a963e70b9208cbee82 + checksum: 10/65d6845d913cfceebdbb1e34d498725965e07abd4c17f3ea9eeba77d9fab7d3b0f726fdfcae73f002b660ba56b236abc8d8aa6670a9c7cc0db27afebf6e48f4b languageName: node linkType: hard @@ -15889,7 +15912,7 @@ __metadata: languageName: node linkType: hard -"lodash-es@npm:4.17.21, lodash-es@npm:^4.17.11, lodash-es@npm:^4.17.15, lodash-es@npm:^4.17.21": +"lodash-es@npm:4.17.21, lodash-es@npm:^4.17.21": version: 4.17.21 resolution: "lodash-es@npm:4.17.21" checksum: 10/03f39878ea1e42b3199bd3f478150ab723f93cc8730ad86fec1f2804f4a07c6e30deaac73cad53a88e9c3db33348bb8ceeb274552390e7a75d7849021c02df43 @@ -18686,10 +18709,10 @@ __metadata: languageName: node linkType: hard -"property-expr@npm:^2.0.2": - version: 2.0.5 - resolution: "property-expr@npm:2.0.5" - checksum: 10/4ebe82ce45aaf1527e96e2ab84d75d25217167ec3ff6378cf83a84fb4abc746e7c65768a79d275881602ae82f168f9a6dfaa7f5e331d0fcc83d692770bcce5f1 +"property-expr@npm:^2.0.5": + version: 2.0.6 + resolution: "property-expr@npm:2.0.6" + checksum: 10/89977f4bb230736c1876f460dd7ca9328034502fd92e738deb40516d16564b850c0bbc4e052c3df88b5b8cd58e51c93b46a94bea049a3f23f4a022c038864cab languageName: node linkType: hard @@ -18963,6 +18986,18 @@ __metadata: languageName: node linkType: hard +"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.2" + peerDependencies: + react: ^18.3.1 + checksum: 10/3f4b73a3aa083091173b29812b10394dd06f4ac06aff410b74702cfb3aa29d7b0ced208aab92d5272919b612e5cda21aeb1d54191848cf6e46e9e354f3541f81 + languageName: node + linkType: hard + "react-error-boundary@npm:^4.0.11": version: 4.0.11 resolution: "react-error-boundary@npm:4.0.11" @@ -18974,6 +19009,17 @@ __metadata: languageName: node linkType: hard +"react-error-boundary@npm:^4.0.13": + version: 4.0.13 + resolution: "react-error-boundary@npm:4.0.13" + dependencies: + "@babel/runtime": "npm:^7.12.5" + peerDependencies: + react: ">=16.13.1" + checksum: 10/28fdf498a58621e21d93978c61719c52455bc00b778080259c5830fe003736153469ebc84f243d7989567b1196e25648c7592f7c8e47de47fcd7d12b875879b9 + languageName: node + linkType: hard + "react-fast-compare@npm:^2.0.1": version: 2.0.4 resolution: "react-fast-compare@npm:2.0.4" @@ -19075,7 +19121,7 @@ __metadata: languageName: node linkType: hard -"react-markdown@npm:^7.1.0": +"react-markdown@npm:^7.1.2": version: 7.1.2 resolution: "react-markdown@npm:7.1.2" dependencies: @@ -19198,7 +19244,7 @@ __metadata: languageName: node linkType: hard -"react-webcam@npm:^7.1.1": +"react-webcam@npm:^7.2.0": version: 7.2.0 resolution: "react-webcam@npm:7.2.0" peerDependencies: @@ -19217,6 +19263,15 @@ __metadata: languageName: node linkType: hard +"react@npm:^18.3.1": + version: 18.3.1 + resolution: "react@npm:18.3.1" + dependencies: + loose-envify: "npm:^1.1.0" + checksum: 10/261137d3f3993eaa2368a83110466fc0e558bc2c7f7ae7ca52d94f03aac945f45146bd85e5f481044db1758a1dbb57879e2fcdd33924e2dde1bdc550ce73f7bf + languageName: node + linkType: hard + "read-package-json-fast@npm:^3.0.0": version: 3.0.1 resolution: "read-package-json-fast@npm:3.0.1" @@ -19988,6 +20043,15 @@ __metadata: languageName: node linkType: hard +"scheduler@npm:^0.23.2": + version: 0.23.2 + resolution: "scheduler@npm:0.23.2" + dependencies: + loose-envify: "npm:^1.1.0" + checksum: 10/e8d68b89d18d5b028223edf090092846868a765a591944760942b77ea1f69b17235f7e956696efbb62c8130ab90af7e0949bfb8eba7896335507317236966bc9 + languageName: node + linkType: hard + "schema-utils@npm:2.7.0": version: 2.7.0 resolution: "schema-utils@npm:2.7.0" @@ -21205,13 +21269,6 @@ __metadata: languageName: node linkType: hard -"synchronous-promise@npm:^2.0.13": - version: 2.0.17 - resolution: "synchronous-promise@npm:2.0.17" - checksum: 10/dd74b1c05caab8ea34e26c8b52a0966efd70b0229ad39447ce066501dd6931d4d97a3f88b0f306880a699660cd334180a24d9738b385aed0bd0104a5be207ec1 - languageName: node - linkType: hard - "systemjs-webpack-interop@npm:^2.3.7": version: 2.3.7 resolution: "systemjs-webpack-interop@npm:2.3.7" @@ -21424,6 +21481,13 @@ __metadata: languageName: node linkType: hard +"tiny-case@npm:^1.0.3": + version: 1.0.3 + resolution: "tiny-case@npm:1.0.3" + checksum: 10/3f7a30c39d5b0e1bc097b0b271bec14eb5b836093db034f35a0de26c14422380b50dc12bfd37498cf35b192f5df06f28a710712c87ead68872a9e37ad6f6049d + languageName: node + linkType: hard + "tiny-warning@npm:^1.0.2": version: 1.0.3 resolution: "tiny-warning@npm:1.0.3" @@ -21694,7 +21758,7 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.4.1, tslib@npm:^2.6.2": +"tslib@npm:^2.0.0, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.4.1, tslib@npm:^2.6.2": version: 2.6.2 resolution: "tslib@npm:2.6.2" checksum: 10/bd26c22d36736513980091a1e356378e8b662ded04204453d353a7f34a4c21ed0afc59b5f90719d4ba756e581a162ecbf93118dc9c6be5acf70aa309188166ca @@ -21863,6 +21927,13 @@ __metadata: languageName: node linkType: hard +"type-fest@npm:^2.19.0": + version: 2.19.0 + resolution: "type-fest@npm:2.19.0" + checksum: 10/7bf9e8fdf34f92c8bb364c0af14ca875fac7e0183f2985498b77be129dc1b3b1ad0a6b3281580f19e48c6105c037fb966ad9934520c69c6434d17fd0af4eed78 + languageName: node + linkType: hard + "type-is@npm:~1.6.18": version: 1.6.18 resolution: "type-is@npm:1.6.18" @@ -23649,18 +23720,15 @@ __metadata: languageName: node linkType: hard -"yup@npm:^0.29.1": - version: 0.29.3 - resolution: "yup@npm:0.29.3" +"yup@npm:^1.4.0": + version: 1.4.0 + resolution: "yup@npm:1.4.0" dependencies: - "@babel/runtime": "npm:^7.10.5" - fn-name: "npm:~3.0.0" - lodash: "npm:^4.17.15" - lodash-es: "npm:^4.17.11" - property-expr: "npm:^2.0.2" - synchronous-promise: "npm:^2.0.13" + property-expr: "npm:^2.0.5" + tiny-case: "npm:^1.0.3" toposort: "npm:^2.0.2" - checksum: 10/78dde0d087cb5dc78c64b0e82c913009260604aa100f500f0b10a703ed263fa65791c4cfcec4feb886d95f74d4312dd2214802e47ba048f120a63d42f171eef6 + type-fest: "npm:^2.19.0" + checksum: 10/3d1277e5e1fff4d8130e525c7361f54874ca848ebd427a0aa66606952e3370b9947d84a1ea0b943f389649e886d26b1349930889727489460d6f2f86c2a26e77 languageName: node linkType: hard From da2a8f59c59feb8b418e6d576c0eb51e7c8713bf Mon Sep 17 00:00:00 2001 From: Dennis Kigen Date: Mon, 20 May 2024 17:57:42 +0300 Subject: [PATCH 2/3] Fixup --- packages/esm-form-engine-app/package.json | 4 +- yarn.lock | 82 ++--------------------- 2 files changed, 9 insertions(+), 77 deletions(-) diff --git a/packages/esm-form-engine-app/package.json b/packages/esm-form-engine-app/package.json index 7e509d5c4a..7f991a370c 100644 --- a/packages/esm-form-engine-app/package.json +++ b/packages/esm-form-engine-app/package.json @@ -38,9 +38,9 @@ }, "dependencies": { "@carbon/react": "^1.12.0", - "@openmrs/openmrs-form-engine-lib": "2.0.0-pre.1045", + "@openmrs/openmrs-form-engine-lib": "next", "lodash-es": "^4.17.21", - "react-error-boundary": "^4.0.11" + "react-error-boundary": "^4.0.13" }, "peerDependencies": { "@openmrs/esm-framework": "5.x", diff --git a/yarn.lock b/yarn.lock index b28af76963..bdf82e7671 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4050,9 +4050,9 @@ __metadata: dependencies: "@carbon/react": "npm:^1.12.0" "@openmrs/esm-patient-common-lib": "workspace:*" - "@openmrs/openmrs-form-engine-lib": "npm:2.0.0-pre.1045" + "@openmrs/openmrs-form-engine-lib": "npm:next" lodash-es: "npm:^4.17.21" - react-error-boundary: "npm:^4.0.11" + react-error-boundary: "npm:^4.0.13" webpack: "npm:^5.88.2" peerDependencies: "@openmrs/esm-framework": 5.x @@ -4760,7 +4760,7 @@ __metadata: languageName: node linkType: hard -"@openmrs/openmrs-form-engine-lib@npm:2.0.0-pre.1045": +"@openmrs/openmrs-form-engine-lib@npm:next": version: 2.0.0-pre.1045 resolution: "@openmrs/openmrs-form-engine-lib@npm:2.0.0-pre.1045" dependencies: @@ -6672,16 +6672,7 @@ __metadata: languageName: node linkType: hard -"@types/react-dom@npm:^18.0.0": - version: 18.2.7 - resolution: "@types/react-dom@npm:18.2.7" - dependencies: - "@types/react": "npm:*" - checksum: 10/9b70ef66cbe2d2898ea37eb79ee3697e0e4ad3d950e769a601f79be94097d43b8ef45b98a0b29528203c7d731c81666f637b2b7032deeced99214b4bc0662614 - languageName: node - linkType: hard - -"@types/react-dom@npm:^18.3.0": +"@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.3.0": version: 18.3.0 resolution: "@types/react-dom@npm:18.3.0" dependencies: @@ -6690,18 +6681,7 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*": - version: 18.2.22 - resolution: "@types/react@npm:18.2.22" - dependencies: - "@types/prop-types": "npm:*" - "@types/scheduler": "npm:*" - csstype: "npm:^3.0.2" - checksum: 10/a9579ed16492fb08266adb98377bf4b8b6ce2078e8fe19be0bbca3fbea15ec8a9fde9828420192458be7bef6e63f9509ce92c7b8c890ce2973ff40b7091302e6 - languageName: node - linkType: hard - -"@types/react@npm:^18.3.2": +"@types/react@npm:*, @types/react@npm:^18.3.2": version: 18.3.2 resolution: "@types/react@npm:18.3.2" dependencies: @@ -6736,13 +6716,6 @@ __metadata: languageName: node linkType: hard -"@types/scheduler@npm:*": - version: 0.16.2 - resolution: "@types/scheduler@npm:0.16.2" - checksum: 10/b6b4dcfeae6deba2e06a70941860fb1435730576d3689225a421280b7742318d1548b3d22c1f66ab68e414f346a9542f29240bc955b6332c5b11e561077583bc - languageName: node - linkType: hard - "@types/selenium-webdriver@npm:^3.0.0": version: 3.0.20 resolution: "@types/selenium-webdriver@npm:3.0.20" @@ -18974,19 +18947,7 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:^18.1.0, react-dom@npm:^18.2.0": - version: 18.2.0 - resolution: "react-dom@npm:18.2.0" - dependencies: - loose-envify: "npm:^1.1.0" - scheduler: "npm:^0.23.0" - peerDependencies: - react: ^18.2.0 - checksum: 10/ca5e7762ec8c17a472a3605b6f111895c9f87ac7d43a610ab7024f68cd833d08eda0625ce02ec7178cc1f3c957cf0b9273cdc17aa2cd02da87544331c43b1d21 - languageName: node - linkType: hard - -"react-dom@npm:^18.3.1": +"react-dom@npm:^18.1.0, react-dom@npm:^18.2.0, react-dom@npm:^18.3.1": version: 18.3.1 resolution: "react-dom@npm:18.3.1" dependencies: @@ -18998,17 +18959,6 @@ __metadata: languageName: node linkType: hard -"react-error-boundary@npm:^4.0.11": - version: 4.0.11 - resolution: "react-error-boundary@npm:4.0.11" - dependencies: - "@babel/runtime": "npm:^7.12.5" - peerDependencies: - react: ">=16.13.1" - checksum: 10/12495458ec9f4a809f5eac684e115cc4247aa607c686f8506caf32930c53d4bb6c234428c12d7ab91708f34cfdbc6452be0ef0fb8c857cc11aea165d3e76aa27 - languageName: node - linkType: hard - "react-error-boundary@npm:^4.0.13": version: 4.0.13 resolution: "react-error-boundary@npm:4.0.13" @@ -19254,16 +19204,7 @@ __metadata: languageName: node linkType: hard -"react@npm:^18.1.0, react@npm:^18.2.0": - version: 18.2.0 - resolution: "react@npm:18.2.0" - dependencies: - loose-envify: "npm:^1.1.0" - checksum: 10/b9214a9bd79e99d08de55f8bef2b7fc8c39630be97c4e29d7be173d14a9a10670b5325e94485f74cd8bff4966ef3c78ee53c79a7b0b9b70cba20aa8973acc694 - languageName: node - linkType: hard - -"react@npm:^18.3.1": +"react@npm:^18.1.0, react@npm:^18.2.0, react@npm:^18.3.1": version: 18.3.1 resolution: "react@npm:18.3.1" dependencies: @@ -20034,15 +19975,6 @@ __metadata: languageName: node linkType: hard -"scheduler@npm:^0.23.0": - version: 0.23.0 - resolution: "scheduler@npm:0.23.0" - dependencies: - loose-envify: "npm:^1.1.0" - checksum: 10/0c4557aa37bafca44ff21dc0ea7c92e2dbcb298bc62eae92b29a39b029134f02fb23917d6ebc8b1fa536b4184934314c20d8864d156a9f6357f3398aaf7bfda8 - languageName: node - linkType: hard - "scheduler@npm:^0.23.2": version: 0.23.2 resolution: "scheduler@npm:0.23.2" From f43c99857901f4ac3ea23a6d71f473d5f9f67bd9 Mon Sep 17 00:00:00 2001 From: Dennis Kigen Date: Mon, 20 May 2024 18:12:12 +0300 Subject: [PATCH 3/3] Bump test deps to remove warnings --- package.json | 8 +- yarn.lock | 213 ++++++++++++--------------------------------------- 2 files changed, 52 insertions(+), 169 deletions(-) diff --git a/package.json b/package.json index 712f9521f3..c91c9bb09e 100644 --- a/package.json +++ b/package.json @@ -28,10 +28,10 @@ "@swc/cli": "^0.1.62", "@swc/core": "^1.3.89", "@swc/jest": "^0.2.29", - "@testing-library/dom": "^9.3.3", - "@testing-library/jest-dom": "^6.1.5", - "@testing-library/react": "^14.1.2", - "@testing-library/user-event": "^14.5.1", + "@testing-library/dom": "^10.1.0", + "@testing-library/jest-dom": "^6.4.5", + "@testing-library/react": "^15.0.7", + "@testing-library/user-event": "^14.5.2", "@types/fhir": "^0.0.31", "@types/jest": "^29.5.11", "@types/lodash-es": "^4.17.9", diff --git a/yarn.lock b/yarn.lock index bdf82e7671..ae62727c2b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12,10 +12,10 @@ __metadata: languageName: node linkType: hard -"@adobe/css-tools@npm:^4.3.1": - version: 4.3.2 - resolution: "@adobe/css-tools@npm:4.3.2" - checksum: 10/973dcb7ba5141f57ec726ddec2e94e8947361bb0c5f0e8ebd1e8aa3a84b28e66db4ad843908825f99730d59784ff3c43868b014a7268676a65950cdb850c42cc +"@adobe/css-tools@npm:^4.3.2": + version: 4.3.3 + resolution: "@adobe/css-tools@npm:4.3.3" + checksum: 10/0e77057efb4e18182560855503066b75edca98671be327d3f8a7ae89ec3da6821e693114b55225909fca00d7e7ed8422f3d79d71fe95dd4d5df1f2026a9fda02 languageName: node linkType: hard @@ -4323,10 +4323,10 @@ __metadata: "@swc/cli": "npm:^0.1.62" "@swc/core": "npm:^1.3.89" "@swc/jest": "npm:^0.2.29" - "@testing-library/dom": "npm:^9.3.3" - "@testing-library/jest-dom": "npm:^6.1.5" - "@testing-library/react": "npm:^14.1.2" - "@testing-library/user-event": "npm:^14.5.1" + "@testing-library/dom": "npm:^10.1.0" + "@testing-library/jest-dom": "npm:^6.4.5" + "@testing-library/react": "npm:^15.0.7" + "@testing-library/user-event": "npm:^14.5.2" "@types/fhir": "npm:^0.0.31" "@types/jest": "npm:^29.5.11" "@types/lodash-es": "npm:^4.17.9" @@ -6111,72 +6111,79 @@ __metadata: languageName: node linkType: hard -"@testing-library/dom@npm:^9.0.0, @testing-library/dom@npm:^9.3.3": - version: 9.3.3 - resolution: "@testing-library/dom@npm:9.3.3" +"@testing-library/dom@npm:^10.0.0, @testing-library/dom@npm:^10.1.0": + version: 10.1.0 + resolution: "@testing-library/dom@npm:10.1.0" dependencies: "@babel/code-frame": "npm:^7.10.4" "@babel/runtime": "npm:^7.12.5" "@types/aria-query": "npm:^5.0.1" - aria-query: "npm:5.1.3" + aria-query: "npm:5.3.0" chalk: "npm:^4.1.0" dom-accessibility-api: "npm:^0.5.9" lz-string: "npm:^1.5.0" pretty-format: "npm:^27.0.2" - checksum: 10/1ebd1672226600049ce16509d6964bdad8ee71b10f7e68f98126e00638c08ebefb6b7c729a0f2a41cffc77902c3081a95fc2bc1a097cae442ed4a5c481f348b7 + checksum: 10/6d6ef942deedf547180c76d4cc2c43fe8e52a98ef68be6ba7382a43d3b1e1e5696d9c32ae0b2df12c92ea50023187d132ad2542fc118ba4b900f149e97d019e0 languageName: node linkType: hard -"@testing-library/jest-dom@npm:^6.1.5": - version: 6.1.5 - resolution: "@testing-library/jest-dom@npm:6.1.5" +"@testing-library/jest-dom@npm:^6.4.5": + version: 6.4.5 + resolution: "@testing-library/jest-dom@npm:6.4.5" dependencies: - "@adobe/css-tools": "npm:^4.3.1" + "@adobe/css-tools": "npm:^4.3.2" "@babel/runtime": "npm:^7.9.2" aria-query: "npm:^5.0.0" chalk: "npm:^3.0.0" css.escape: "npm:^1.5.1" - dom-accessibility-api: "npm:^0.5.6" - lodash: "npm:^4.17.15" + dom-accessibility-api: "npm:^0.6.3" + lodash: "npm:^4.17.21" redent: "npm:^3.0.0" peerDependencies: "@jest/globals": ">= 28" + "@types/bun": "*" "@types/jest": ">= 28" jest: ">= 28" vitest: ">= 0.32" peerDependenciesMeta: "@jest/globals": optional: true + "@types/bun": + optional: true "@types/jest": optional: true jest: optional: true vitest: optional: true - checksum: 10/3bc45dc9cb6dc49134e79ef636612b8639014bdd8c85c3741a78a92345147d03f9efeefc2f02ad306764a62f8c236b0e0ef3d5a68c16af1c51887be45d253f6b + checksum: 10/6d9e6cc01ec9111ea631657d93596fa9505d294fdfc4172fbd750b8df6268f02d55900626423b195dac5b067a302557453894a5814bdf4e770dee37cdb1c0f2d languageName: node linkType: hard -"@testing-library/react@npm:^14.1.2": - version: 14.1.2 - resolution: "@testing-library/react@npm:14.1.2" +"@testing-library/react@npm:^15.0.7": + version: 15.0.7 + resolution: "@testing-library/react@npm:15.0.7" dependencies: "@babel/runtime": "npm:^7.12.5" - "@testing-library/dom": "npm:^9.0.0" + "@testing-library/dom": "npm:^10.0.0" "@types/react-dom": "npm:^18.0.0" peerDependencies: + "@types/react": ^18.0.0 react: ^18.0.0 react-dom: ^18.0.0 - checksum: 10/1664990ad9673403ee1d74c1c1b60ec30591d42a3fe1e2175c28cb935cd49bc9a4ba398707f702acc3278c3b0cb492ee57fe66f41ceb040c5da57de98cba5414 + peerDependenciesMeta: + "@types/react": + optional: true + checksum: 10/a9342ad09b019b0f99688fb50265899bc93adfe23c22aa6743fd920635b43fdc66877e66d95f240923aa6f7d3aa360837f5b053fb363a31975788974dff7bc93 languageName: node linkType: hard -"@testing-library/user-event@npm:^14.5.1": - version: 14.5.1 - resolution: "@testing-library/user-event@npm:14.5.1" +"@testing-library/user-event@npm:^14.5.2": + version: 14.5.2 + resolution: "@testing-library/user-event@npm:14.5.2" peerDependencies: "@testing-library/dom": ">=7.21.4" - checksum: 10/696e1328c230b0a7063a41d82b5350c6be926696106809a4d79d446d190ff56bebb850fe564ff0952cb74ae81e59a6f10534a88ecbb3792083271a249e04e728 + checksum: 10/49821459d81c6bc435d97128d6386ca24f1e4b3ba8e46cb5a96fe3643efa6e002d88c1b02b7f2ec58da593e805c59b78d7fdf0db565c1f02ba782f63ee984040 languageName: node linkType: hard @@ -7811,15 +7818,6 @@ __metadata: languageName: node linkType: hard -"aria-query@npm:5.1.3": - version: 5.1.3 - resolution: "aria-query@npm:5.1.3" - dependencies: - deep-equal: "npm:^2.0.5" - checksum: 10/e5da608a7c4954bfece2d879342b6c218b6b207e2d9e5af270b5e38ef8418f02d122afdc948b68e32649b849a38377785252059090d66fa8081da95d1609c0d2 - languageName: node - linkType: hard - "aria-query@npm:5.3.0, aria-query@npm:^5.0.0": version: 5.3.0 resolution: "aria-query@npm:5.3.0" @@ -10646,32 +10644,6 @@ __metadata: languageName: node linkType: hard -"deep-equal@npm:^2.0.5": - version: 2.2.2 - resolution: "deep-equal@npm:2.2.2" - dependencies: - array-buffer-byte-length: "npm:^1.0.0" - call-bind: "npm:^1.0.2" - es-get-iterator: "npm:^1.1.3" - get-intrinsic: "npm:^1.2.1" - is-arguments: "npm:^1.1.1" - is-array-buffer: "npm:^3.0.2" - is-date-object: "npm:^1.0.5" - is-regex: "npm:^1.1.4" - is-shared-array-buffer: "npm:^1.0.2" - isarray: "npm:^2.0.5" - object-is: "npm:^1.1.5" - object-keys: "npm:^1.1.1" - object.assign: "npm:^4.1.4" - regexp.prototype.flags: "npm:^1.5.0" - side-channel: "npm:^1.0.4" - which-boxed-primitive: "npm:^1.0.2" - which-collection: "npm:^1.0.1" - which-typed-array: "npm:^1.1.9" - checksum: 10/883cb8b3cf10d387ce8fb191f7d7b46b48022e00810074c5629053953aa3be5c5890dd40d30d31d27fb140af9a541c06c852ab5d28f76b07095c9d28e3c4b04f - languageName: node - linkType: hard - "deep-is@npm:^0.1.3, deep-is@npm:~0.1.3": version: 0.1.4 resolution: "deep-is@npm:0.1.4" @@ -10904,13 +10876,20 @@ __metadata: languageName: node linkType: hard -"dom-accessibility-api@npm:^0.5.6, dom-accessibility-api@npm:^0.5.9": +"dom-accessibility-api@npm:^0.5.9": version: 0.5.14 resolution: "dom-accessibility-api@npm:0.5.14" checksum: 10/19d7a7de931fcc7d9d67c270341220c6bda97124c3b1444b2bea6e8c6c3964ee09c339e3e69be5b830e3fcb60258d43e6377039974b69c5cec2f75db0114ac59 languageName: node linkType: hard +"dom-accessibility-api@npm:^0.6.3": + version: 0.6.3 + resolution: "dom-accessibility-api@npm:0.6.3" + checksum: 10/83d3371f8226487fbad36e160d44f1d9017fb26d46faba6a06fcad15f34633fc827b8c3e99d49f71d5f3253d866e2131826866fd0a3c86626f8eccfc361881ff + languageName: node + linkType: hard + "dom-converter@npm:^0.2.0": version: 0.2.0 resolution: "dom-converter@npm:0.2.0" @@ -11391,23 +11370,6 @@ __metadata: languageName: node linkType: hard -"es-get-iterator@npm:^1.1.3": - version: 1.1.3 - resolution: "es-get-iterator@npm:1.1.3" - dependencies: - call-bind: "npm:^1.0.2" - get-intrinsic: "npm:^1.1.3" - has-symbols: "npm:^1.0.3" - is-arguments: "npm:^1.1.1" - is-map: "npm:^2.0.2" - is-set: "npm:^2.0.2" - is-string: "npm:^1.0.7" - isarray: "npm:^2.0.5" - stop-iteration-iterator: "npm:^1.0.0" - checksum: 10/bc2194befbe55725f9489098626479deee3c801eda7e83ce0dff2eb266a28dc808edb9b623ff01d31ebc1328f09d661333d86b601036692c2e3c1a6942319433 - languageName: node - linkType: hard - "es-module-lexer@npm:^1.2.1": version: 1.3.0 resolution: "es-module-lexer@npm:1.3.0" @@ -13897,7 +13859,7 @@ __metadata: languageName: node linkType: hard -"internal-slot@npm:^1.0.3, internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.5": +"internal-slot@npm:^1.0.3, internal-slot@npm:^1.0.5": version: 1.0.5 resolution: "internal-slot@npm:1.0.5" dependencies: @@ -13981,16 +13943,6 @@ __metadata: languageName: node linkType: hard -"is-arguments@npm:^1.1.1": - version: 1.1.1 - resolution: "is-arguments@npm:1.1.1" - dependencies: - call-bind: "npm:^1.0.2" - has-tostringtag: "npm:^1.0.0" - checksum: 10/a170c7e26082e10de9be6e96d32ae3db4d5906194051b792e85fae3393b53cf2cb5b3557863e5c8ccbab55e2fd8f2f75aa643d437613f72052cf0356615c34be - languageName: node - linkType: hard - "is-array-buffer@npm:^3.0.1, is-array-buffer@npm:^3.0.2": version: 3.0.2 resolution: "is-array-buffer@npm:3.0.2" @@ -14074,7 +14026,7 @@ __metadata: languageName: node linkType: hard -"is-date-object@npm:^1.0.1, is-date-object@npm:^1.0.5": +"is-date-object@npm:^1.0.1": version: 1.0.5 resolution: "is-date-object@npm:1.0.5" dependencies: @@ -14159,13 +14111,6 @@ __metadata: languageName: node linkType: hard -"is-map@npm:^2.0.1, is-map@npm:^2.0.2": - version: 2.0.2 - resolution: "is-map@npm:2.0.2" - checksum: 10/60ba910f835f2eacb1fdf5b5a6c60fe1c702d012a7673e6546992bcc0c873f62ada6e13d327f9e48f1720d49c152d6cdecae1fa47a261ef3d247c3ce6f0e1d39 - languageName: node - linkType: hard - "is-module@npm:^1.0.0": version: 1.0.0 resolution: "is-module@npm:1.0.0" @@ -14337,13 +14282,6 @@ __metadata: languageName: node linkType: hard -"is-set@npm:^2.0.1, is-set@npm:^2.0.2": - version: 2.0.2 - resolution: "is-set@npm:2.0.2" - checksum: 10/d89e82acdc7760993474f529e043f9c4a1d63ed4774d21cc2e331d0e401e5c91c27743cd7c889137028f6a742234759a4bd602368fbdbf0b0321994aefd5603f - languageName: node - linkType: hard - "is-shared-array-buffer@npm:^1.0.2": version: 1.0.2 resolution: "is-shared-array-buffer@npm:1.0.2" @@ -14442,13 +14380,6 @@ __metadata: languageName: node linkType: hard -"is-weakmap@npm:^2.0.1": - version: 2.0.1 - resolution: "is-weakmap@npm:2.0.1" - checksum: 10/289fa4e8ba1bdda40ca78481266f6925b7c46a85599e6a41a77010bf91e5a24dfb660db96863bbf655ecdbda0ab517204d6a4e0c151dbec9d022c556321f3776 - languageName: node - linkType: hard - "is-weakref@npm:^1.0.2": version: 1.0.2 resolution: "is-weakref@npm:1.0.2" @@ -14458,16 +14389,6 @@ __metadata: languageName: node linkType: hard -"is-weakset@npm:^2.0.1": - version: 2.0.2 - resolution: "is-weakset@npm:2.0.2" - dependencies: - call-bind: "npm:^1.0.2" - get-intrinsic: "npm:^1.1.1" - checksum: 10/8f2ddb9639716fd7936784e175ea1183c5c4c05274c34f34f6a53175313cb1c9c35a8b795623306995e2f7cc8f25aa46302f15a2113e51c5052d447be427195c - languageName: node - linkType: hard - "is-what@npm:^3.14.1": version: 3.14.1 resolution: "is-what@npm:3.14.1" @@ -14491,13 +14412,6 @@ __metadata: languageName: node linkType: hard -"isarray@npm:^2.0.5": - version: 2.0.5 - resolution: "isarray@npm:2.0.5" - checksum: 10/1d8bc7911e13bb9f105b1b3e0b396c787a9e63046af0b8fe0ab1414488ab06b2b099b87a2d8a9e31d21c9a6fad773c7fc8b257c4880f2d957274479d28ca3414 - languageName: node - linkType: hard - "isarray@npm:~1.0.0": version: 1.0.0 resolution: "isarray@npm:1.0.0" @@ -15955,7 +15869,7 @@ __metadata: languageName: node linkType: hard -"lodash@npm:^4.17.11, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.7.0": +"lodash@npm:^4.17.11, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.7.0": version: 4.17.21 resolution: "lodash@npm:4.17.21" checksum: 10/c08619c038846ea6ac754abd6dd29d2568aa705feb69339e836dfa8d8b09abbb2f859371e86863eda41848221f9af43714491467b5b0299122431e202bb0c532 @@ -17391,16 +17305,6 @@ __metadata: languageName: node linkType: hard -"object-is@npm:^1.1.5": - version: 1.1.5 - resolution: "object-is@npm:1.1.5" - dependencies: - call-bind: "npm:^1.0.2" - define-properties: "npm:^1.1.3" - checksum: 10/75365aff5da4bebad5d20efd9f9a7a13597e603f5eb03d89da8f578c3f3937fe01c6cb5fce86c0611c48795c0841401fd37c943821db0de703c7b30a290576ad - languageName: node - linkType: hard - "object-keys@npm:^1.1.1": version: 1.1.1 resolution: "object-keys@npm:1.1.1" @@ -19351,7 +19255,7 @@ __metadata: languageName: node linkType: hard -"regexp.prototype.flags@npm:^1.4.1, regexp.prototype.flags@npm:^1.4.3, regexp.prototype.flags@npm:^1.5.0": +"regexp.prototype.flags@npm:^1.4.1, regexp.prototype.flags@npm:^1.4.3": version: 1.5.1 resolution: "regexp.prototype.flags@npm:1.5.1" dependencies: @@ -20768,15 +20672,6 @@ __metadata: languageName: node linkType: hard -"stop-iteration-iterator@npm:^1.0.0": - version: 1.0.0 - resolution: "stop-iteration-iterator@npm:1.0.0" - dependencies: - internal-slot: "npm:^1.0.4" - checksum: 10/2a23a36f4f6bfa63f46ae2d53a3f80fe8276110b95a55345d8ed3d92125413494033bc8697eb774e8f7aeb5725f70e3d69753caa2ecacdac6258c16fa8aa8b0f - languageName: node - linkType: hard - "stream-shift@npm:^1.0.0": version: 1.0.1 resolution: "stream-shift@npm:1.0.1" @@ -23049,18 +22944,6 @@ __metadata: languageName: node linkType: hard -"which-collection@npm:^1.0.1": - version: 1.0.1 - resolution: "which-collection@npm:1.0.1" - dependencies: - is-map: "npm:^2.0.1" - is-set: "npm:^2.0.1" - is-weakmap: "npm:^2.0.1" - is-weakset: "npm:^2.0.1" - checksum: 10/85c95fcf92df7972ce66bed879e53d9dc752a30ef08e1ca4696df56bcf1c302e3b9965a39b04a20fa280a997fad6c170eb0b4d62435569b7f6c0bc7be910572b - languageName: node - linkType: hard - "which-module@npm:^2.0.0": version: 2.0.0 resolution: "which-module@npm:2.0.0"