Merge pull request #12 from samuelmale/chore/migrate-to-5x

(chore) Migrate to framework v5
IsantePlus · Sep 29, 2023 · 499f385 · 499f385
2 parents 763cdab + 5dd2774
commit 499f385
Show file tree

Hide file tree

Showing 19 changed files with 3,211 additions and 972 deletions.
diff --git a/package.json b/package.json
@@ -44,20 +44,20 @@
   },
   "dependencies": {
     "@carbon/react": "^1.14.0",
-    "@openmrs/esm-patient-common-lib": "^4.0.0",
     "lodash-es": "^4.17.15"
   },
   "peerDependencies": {
-    "@openmrs/esm-framework": "4.x",
-    "@openmrs/esm-patient-common-lib": "4.x",
+    "@openmrs/esm-framework": "5.x",
+    "@openmrs/esm-patient-common-lib": "5.x",
     "dayjs": "1.x",
     "react": "18.x",
     "react-i18next": "11.x",
     "react-router-dom": "6.x",
     "rxjs": "6.x"
   },
   "devDependencies": {
-    "@openmrs/esm-framework": "4.x",
+    "@openmrs/esm-framework": "next",
+    "@openmrs/esm-patient-common-lib": "next",
     "@openmrs/esm-styleguide": "next",
     "@swc/cli": "^0.1.57",
     "@swc/core": "^1.3.6",
@@ -74,6 +74,7 @@
     "@types/webpack-env": "^1.16.0",
     "@typescript-eslint/parser": "^5.40.0",
     "concurrently": "^7.4.0",
+    "css-loader": "^3.2.0",
     "eslint": "^8.25.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-ts-react-important-stuff": "^3.0.0",

diff --git a/src/boxes/extensions/blue-box.tsx b/src/boxes/extensions/blue-box.tsx
diff --git a/src/boxes/extensions/box.scss b/src/boxes/extensions/box.scss
diff --git a/src/boxes/extensions/brand-box.tsx b/src/boxes/extensions/brand-box.tsx
diff --git a/src/boxes/extensions/red-box.tsx b/src/boxes/extensions/red-box.tsx
diff --git a/src/boxes/slot/boxes.css b/src/boxes/slot/boxes.css
diff --git a/src/boxes/slot/boxes.tsx b/src/boxes/slot/boxes.tsx
diff --git a/src/greeter/greeter.css b/src/greeter/greeter.css
diff --git a/src/greeter/greeter.test.tsx b/src/greeter/greeter.test.tsx
diff --git a/src/greeter/greeter.tsx b/src/greeter/greeter.tsx
diff --git a/src/hello.css b/src/hello.css
diff --git a/src/hello.test.tsx b/src/hello.test.tsx
diff --git a/src/hello.tsx b/src/hello.tsx