From 7fc392e2b75ed8b05b84b40d3fb5535a43ee2305 Mon Sep 17 00:00:00 2001 From: CynthiaKamau Date: Fri, 24 May 2024 10:21:07 +0300 Subject: [PATCH] (fix) Fixed form renderer linking issues --- packages/esm-commons-lib/package.json | 2 +- packages/esm-form-render-app/package.json | 2 +- yarn.lock | 98 ++++++++++++++++------- 3 files changed, 73 insertions(+), 29 deletions(-) diff --git a/packages/esm-commons-lib/package.json b/packages/esm-commons-lib/package.json index cf1fe6181..5f5377057 100644 --- a/packages/esm-commons-lib/package.json +++ b/packages/esm-commons-lib/package.json @@ -36,7 +36,7 @@ "fuzzy": "^0.1.3", "lodash-es": "^4.17.15", "systemjs-webpack-interop": "^2.3.7", - "yup": "^0.29.1" + "yup": "^1.4.0" }, "peerDependencies": { "@openmrs/esm-framework": "*", diff --git a/packages/esm-form-render-app/package.json b/packages/esm-form-render-app/package.json index 26367114c..780b6950a 100644 --- a/packages/esm-form-render-app/package.json +++ b/packages/esm-form-render-app/package.json @@ -40,7 +40,7 @@ "dependencies": { "@carbon/react": "^1.13.0", "@openmrs/openmrs-form-engine-lib": "2.0.0-pre.1029", - "ace-builds": "^1.4.12", + "ace-builds": "1.34.0", "react-ace": "^9.4.4" }, "peerDependencies": { diff --git a/yarn.lock b/yarn.lock index 665c5b7d4..8f7fa9cd0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1310,7 +1310,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.10.5, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.9, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2": +"@babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.9, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2": version: 7.20.6 resolution: "@babel/runtime@npm:7.20.6" dependencies: @@ -1319,7 +1319,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.14.8, @babel/runtime@npm:^7.22.15": +"@babel/runtime@npm:^7.10.5, @babel/runtime@npm:^7.14.8, @babel/runtime@npm:^7.22.15": version: 7.24.5 resolution: "@babel/runtime@npm:7.24.5" dependencies: @@ -2901,7 +2901,7 @@ __metadata: lodash-es: "npm:^4.17.15" systemjs-webpack-interop: "npm:^2.3.7" webpack: "npm:^5.88.2" - yup: "npm:^0.29.1" + yup: "npm:^1.4.0" peerDependencies: "@openmrs/esm-framework": "*" "@openmrs/esm-patient-common-lib": "*" @@ -2952,7 +2952,7 @@ __metadata: dependencies: "@carbon/react": "npm:^1.13.0" "@openmrs/openmrs-form-engine-lib": "npm:2.0.0-pre.1029" - ace-builds: "npm:^1.4.12" + ace-builds: "npm:1.34.0" react-ace: "npm:^9.4.4" webpack: "npm:^5.88.2" peerDependencies: @@ -5091,6 +5091,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: 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" @@ -5860,7 +5870,14 @@ __metadata: languageName: node linkType: hard -"ace-builds@npm:^1.4.12, ace-builds@npm:^1.4.13": +"ace-builds@npm:1.34.0, ace-builds@npm:^1.4.12": + version: 1.34.0 + resolution: "ace-builds@npm:1.34.0" + checksum: bf15b5f9fb3d71687a6b1a3085768a1ac814d106bde0e8c1665a6bd317aade0f5cad74ff1aa3937dabede97bbf5794248804de397845a02e43228b86b286fb26 + languageName: node + linkType: hard + +"ace-builds@npm:^1.4.13": version: 1.13.1 resolution: "ace-builds@npm:1.13.1" checksum: d8deda4c495298a2269f2b750f149194a743c4fd4f011b2066fc47aea424726d24d6756452ea7a4eea2bbc4afee83c2db44797ce7251ae19c427577f4fc23966 @@ -9773,19 +9790,20 @@ __metadata: linkType: hard "formik@npm:^2.2.6": - version: 2.2.9 - resolution: "formik@npm:2.2.9" + 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: c7b4c6ee9cc8256302c56106fa4ff1a86b48774b26e5cdd4fe5a40d5ae2171ed7a02714cd36fa7fb05d8b86c5471643339a69d6e3f4234a963e70b9208cbee82 + checksum: 65d6845d913cfceebdbb1e34d498725965e07abd4c17f3ea9eeba77d9fab7d3b0f726fdfcae73f002b660ba56b236abc8d8aa6670a9c7cc0db27afebf6e48f4b languageName: node linkType: hard @@ -14869,10 +14887,10 @@ __metadata: languageName: node linkType: hard -"property-expr@npm:^2.0.2": - version: 2.0.5 - resolution: "property-expr@npm:2.0.5" - checksum: 4ebe82ce45aaf1527e96e2ab84d75d25217167ec3ff6378cf83a84fb4abc746e7c65768a79d275881602ae82f168f9a6dfaa7f5e331d0fcc83d692770bcce5f1 +"property-expr@npm:^2.0.2, property-expr@npm:^2.0.5": + version: 2.0.6 + resolution: "property-expr@npm:2.0.6" + checksum: 89977f4bb230736c1876f460dd7ca9328034502fd92e738deb40516d16564b850c0bbc4e052c3df88b5b8cd58e51c93b46a94bea049a3f23f4a022c038864cab languageName: node linkType: hard @@ -15098,13 +15116,13 @@ __metadata: linkType: hard "react-error-boundary@npm:^4.0.11": - version: 4.0.12 - resolution: "react-error-boundary@npm:4.0.12" + 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: ba59f885eae3c3786548086c6c2088a9f511080c4052e778017959e9e0b6461892efdcf58fcfc2b3a6bc3e79e17cf842fc8ccdc6d82698c51c2ccab12c8c0b85 + checksum: 28fdf498a58621e21d93978c61719c52455bc00b778080259c5830fe003736153469ebc84f243d7989567b1196e25648c7592f7c8e47de47fcd7d12b875879b9 languageName: node linkType: hard @@ -16769,9 +16787,9 @@ __metadata: linkType: hard "synchronous-promise@npm:^2.0.13": - version: 2.0.16 - resolution: "synchronous-promise@npm:2.0.16" - checksum: 041f532cab52a82ffc95f1e437a4295cf981728ef431b79ca460577a68aeeaf7b1865e582b905f38a7b461bd7b3879f7e44913208eeba972e7057fa29a6976e1 + version: 2.0.17 + resolution: "synchronous-promise@npm:2.0.17" + checksum: dd74b1c05caab8ea34e26c8b52a0966efd70b0229ad39447ce066501dd6931d4d97a3f88b0f306880a699660cd334180a24d9738b385aed0bd0104a5be207ec1 languageName: node linkType: hard @@ -16982,6 +17000,13 @@ __metadata: languageName: node linkType: hard +"tiny-case@npm:^1.0.3": + version: 1.0.3 + resolution: "tiny-case@npm:1.0.3" + checksum: 3f7a30c39d5b0e1bc097b0b271bec14eb5b836093db034f35a0de26c14422380b50dc12bfd37498cf35b192f5df06f28a710712c87ead68872a9e37ad6f6049d + languageName: node + linkType: hard + "tiny-warning@npm:^1.0.2": version: 1.0.3 resolution: "tiny-warning@npm:1.0.3" @@ -17143,13 +17168,20 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^1.10.0, tslib@npm:^1.9.0": +"tslib@npm:^1.9.0": version: 1.14.1 resolution: "tslib@npm:1.14.1" checksum: 7dbf34e6f55c6492637adb81b555af5e3b4f9cc6b998fb440dac82d3b42bdc91560a35a5fb75e20e24a076c651438234da6743d139e4feabf0783f3cdfe1dddb languageName: node linkType: hard +"tslib@npm:^2.0.0, tslib@npm:^2.3.0, tslib@npm:^2.4.0, tslib@npm:^2.6.2": + version: 2.6.2 + resolution: "tslib@npm:2.6.2" + checksum: bd26c22d36736513980091a1e356378e8b662ded04204453d353a7f34a4c21ed0afc59b5f90719d4ba756e581a162ecbf93118dc9c6be5acf70aa309188166ca + languageName: node + linkType: hard + "tslib@npm:^2.0.3": version: 2.4.1 resolution: "tslib@npm:2.4.1" @@ -17157,13 +17189,6 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^2.3.0, tslib@npm:^2.4.0, tslib@npm:^2.6.2": - version: 2.6.2 - resolution: "tslib@npm:2.6.2" - checksum: bd26c22d36736513980091a1e356378e8b662ded04204453d353a7f34a4c21ed0afc59b5f90719d4ba756e581a162ecbf93118dc9c6be5acf70aa309188166ca - languageName: node - linkType: hard - "turbo-darwin-64@npm:1.11.3": version: 1.11.3 resolution: "turbo-darwin-64@npm:1.11.3" @@ -17281,6 +17306,13 @@ __metadata: languageName: node linkType: hard +"type-fest@npm:^2.19.0": + version: 2.19.0 + resolution: "type-fest@npm:2.19.0" + checksum: 7bf9e8fdf34f92c8bb364c0af14ca875fac7e0183f2985498b77be129dc1b3b1ad0a6b3281580f19e48c6105c037fb966ad9934520c69c6434d17fd0af4eed78 + languageName: node + linkType: hard + "type-is@npm:~1.6.18": version: 1.6.18 resolution: "type-is@npm:1.6.18" @@ -18960,6 +18992,18 @@ __metadata: languageName: node linkType: hard +"yup@npm:^1.4.0": + version: 1.4.0 + resolution: "yup@npm:1.4.0" + dependencies: + property-expr: "npm:^2.0.5" + tiny-case: "npm:^1.0.3" + toposort: "npm:^2.0.2" + type-fest: "npm:^2.19.0" + checksum: 3d1277e5e1fff4d8130e525c7361f54874ca848ebd427a0aa66606952e3370b9947d84a1ea0b943f389649e886d26b1349930889727489460d6f2f86c2a26e77 + languageName: node + linkType: hard + "zustand@npm:^4.3.6": version: 4.3.8 resolution: "zustand@npm:4.3.8"