Merge branch 'main' into ImplementerTools

Author: denniskigen

.yarn/releases/yarn-4.9.2.cjs renamed to .yarn/releases/yarn-4.10.3.cjs

@@ -9,4 +9,4 @@ plugins:
     path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
     spec: "https://go.mskelton.dev/yarn-outdated/v4"
 
-yarnPath: .yarn/releases/yarn-4.9.2.cjs
+yarnPath: .yarn/releases/yarn-4.10.3.cjs

.yarnrc.yml

@@ -34,7 +34,8 @@
     "@testing-library/react": "^14.1.2",
     "@testing-library/user-event": "^14.5.2",
     "@types/jest": "^29.5.12",
-    "@types/react-dom": "^18.0.6",
+    "@types/react": "^18.3.21",
+    "@types/react-dom": "^18.3.0",
     "@types/webpack-env": "^1.16.4",
     "@typescript-eslint/eslint-plugin": "^8.35.0",
     "@typescript-eslint/parser": "^8.35.0",
@@ -50,7 +51,7 @@
     "fake-indexeddb": "^4.0.2",
     "fork-ts-checker-webpack-plugin": "^7.2.13",
     "husky": "^8.0.3",
-    "i18next-parser": "^6.6.0",
+    "i18next-parser": "^9.3.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "jest-cli": "^29.7.0",
@@ -68,5 +69,5 @@
     "*.{ts,tsx}": "eslint --cache --fix --max-warnings 0",
     "*.{css,scss,ts,tsx}": "prettier --write --list-different"
   },
-  "packageManager": "yarn@4.9.2"
+  "packageManager": "yarn@4.10.3"
 }

package.json

@@ -41,22 +41,22 @@
     "@openmrs/esm-framework": "*",
     "react": "18.x",
     "react-dom": "18.x",
-    "react-i18next": "11.x",
+    "react-i18next": "16.x",
     "rxjs": "6.x"
   },
   "devDependencies": {
     "@openmrs/esm-framework": "workspace:*",
     "@openmrs/webpack-config": "workspace:*",
     "cross-env": "^7.0.3",
     "happy-dom": "^17.4.7",
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0",
-    "react-i18next": "^11.18.6",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-i18next": "^16.0.0",
     "vitest": "^3.1.4",
     "webpack": "^5.99.9"
   },
   "dependencies": {
-    "@carbon/react": "^1.83.0",
+    "@carbon/react": "^1.92.1",
     "fuzzy": "^0.1.3"
   }
 }

packages/apps/esm-devtools-app/package.json

@@ -41,22 +41,22 @@
     "@openmrs/esm-framework": "*",
     "react": "18.x",
     "react-dom": "18.x",
-    "react-i18next": "11.x",
+    "react-i18next": "16.x",
     "rxjs": "6.x"
   },
   "devDependencies": {
     "@openmrs/esm-framework": "workspace:*",
     "@openmrs/webpack-config": "workspace:*",
     "cross-env": "^7.0.3",
     "happy-dom": "^17.4.7",
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0",
-    "react-i18next": "^11.18.6",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-i18next": "^16.0.0",
     "vitest": "^3.1.4",
     "webpack": "^5.99.9"
   },
   "dependencies": {
-    "@carbon/react": "^1.83.0",
+    "@carbon/react": "^1.92.1",
     "fuzzy": "^0.1.3"
   }
 }

packages/apps/esm-help-menu-app/package.json

@@ -38,26 +38,26 @@
     "access": "public"
   },
   "dependencies": {
-    "@carbon/react": "^1.83.0",
+    "@carbon/react": "^1.92.1",
     "lodash-es": "^4.17.21"
   },
   "peerDependencies": {
     "@carbon/react": "1.x",
     "@openmrs/esm-framework": "*",
     "react": "18.x",
     "react-dom": "18.x",
-    "react-i18next": "11.x",
+    "react-i18next": "16.x",
     "rxjs": "6.x",
     "swr": "2.x"
   },
   "devDependencies": {
     "@openmrs/esm-framework": "workspace:*",
     "@openmrs/webpack-config": "workspace:*",
-    "ace-builds": "^1.4.14",
-    "react": "^18.1.0",
-    "react-ace": "^9.5.0",
-    "react-dom": "^18.1.0",
-    "react-i18next": "^11.18.6",
+    "ace-builds": "^1.43.3",
+    "react": "^18.3.1",
+    "react-ace": "^14.0.1",
+    "react-dom": "^18.3.1",
+    "react-i18next": "^16.0.0",
     "rxjs": "^6.5.3",
     "swr": "2.2.5",
     "webpack": "^5.99.9"

packages/apps/esm-implementer-tools-app/package.json

@@ -1,13 +1,22 @@
 import React, { useCallback, useEffect, useState } from 'react';
-import { Button } from '@carbon/react';
-import { useTranslation } from 'react-i18next';
 import classNames from 'classnames';
 import AceEditor from 'react-ace';
-import 'ace-builds/src-noconflict/mode-json';
-import 'ace-builds/src-noconflict/theme-dracula';
+import { Button } from '@carbon/react';
+import { useTranslation } from 'react-i18next';
 import { clearConfigErrors, temporaryConfigStore, useStore } from '@openmrs/esm-framework/src/internal';
 import styles from './json-editor.scss';
 
+import 'ace-builds/src-noconflict/mode-json';
+import 'ace-builds/src-noconflict/theme-dracula';
+import ace from 'ace-builds/src-noconflict/ace';
+
+// Configure ace to bundle workers locally (webpack 5 asset modules)
+// Using new URL() syntax instead of deprecated file-loader or CDN for offline compatibility
+ace.config.setModuleUrl(
+  'ace/mode/json_worker',
+  new URL('ace-builds/src-noconflict/worker-json.js', import.meta.url).href,
+);
+
 export interface JsonEditorProps {
   /** A CSS value */
   height: string;
@@ -25,17 +34,17 @@ export default function JsonEditor({ height }: JsonEditorProps) {
     try {
       config = JSON.parse(editorValue);
     } catch (e) {
-      setError(e.message);
+      setError(e instanceof Error ? e.message : 'Invalid JSON');
       return;
     }
     setError('');
     clearConfigErrors();
     temporaryConfigStore.setState({ config });
-  }, [editorValue, temporaryConfigStore]);
+  }, [editorValue, temporaryConfig.config]);
 
   useEffect(() => {
     if (editorValue != JSON.stringify(temporaryConfig.config, null, 2)) {
-      setKey((k) => `${k}+`); // just keep appendingplus signs
+      setKey((k) => `${k}+`); // just keep appending plus signs
     }
   }, [temporaryConfig.config]);
 

packages/apps/esm-implementer-tools-app/src/configuration/json-editor/json-editor.component.tsx

@@ -1,6 +1,7 @@
 import React, { useMemo, useState } from 'react';
 import classNames from 'classnames';
-import { useTranslation, type TFunction } from 'react-i18next';
+import { type TFunction } from 'i18next';
+import { useTranslation } from 'react-i18next';
 import { Button } from '@carbon/react';
 import {
   CloseIcon,

packages/apps/esm-implementer-tools-app/src/ui-editor/ui-editor.tsx

@@ -38,7 +38,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@carbon/react": "^1.83.0",
+    "@carbon/react": "^1.92.1",
     "@hookform/resolvers": "^3.6.0",
     "lodash-es": "^4.17.21",
     "react-hook-form": "^7.52.2",
@@ -49,7 +49,7 @@
     "@openmrs/esm-framework": "*",
     "react": "18.x",
     "react-dom": "18.x",
-    "react-i18next": "11.x",
+    "react-i18next": "16.x",
     "react-router-dom": "6.x",
     "rxjs": "6.x",
     "swr": "2.x"
@@ -61,9 +61,9 @@
     "@rspack/core": "^1.3.11",
     "cross-env": "^7.0.3",
     "jest": "^29.7.0",
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0",
-    "react-i18next": "^11.18.6",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-i18next": "^16.0.0",
     "react-router-dom": "^6.3.0",
     "rxjs": "^6.5.3",
     "swr": "2.2.5",

packages/apps/esm-login-app/package.json

@@ -1,6 +1,6 @@
 import React from 'react';
 import { interpolateUrl, useConfig } from '@openmrs/esm-framework';
-import { type TFunction } from 'react-i18next';
+import { type TFunction } from 'i18next';
 import { type ConfigSchema } from './config-schema';
 import styles from './login/login.scss';
 
@@ -16,7 +16,7 @@ const Logo: React.FC<{ t: TFunction }> = ({ t }) => {
     <svg role="img" className={styles.logo}>
       <title>{t('openmrsLogo', 'OpenMRS logo')}</title>
       <use href="#omrs-logo-full-color"></use>
-    </svg> 
+    </svg>
   );
 };