@openmrs/esm-react-utils 3.2.1-pre.1104 → 3.2.1-pre.1111

package/jest.config.js

@@ -1,6 +1,6 @@
 module.exports = {
   transform: {
-    "^.+\\.tsx?$": "babel-jest",
+    "^.+\\.tsx?$": ["@swc/jest"],
   },
   setupFiles: ["<rootDir>/src/setup-tests.js"],
   moduleNameMapper: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-react-utils",
-  "version": "3.2.1-pre.1104",
+  "version": "3.2.1-pre.1111",
   "license": "MPL-2.0",
   "description": "React utilities for OpenMRS.",
   "browser": "dist/openmrs-esm-react-utils.js",
@@ -55,11 +55,11 @@
     "react-i18next": "11.x"
   },
   "devDependencies": {
-    "@openmrs/esm-api": "^3.2.1-pre.1104",
-    "@openmrs/esm-config": "^3.2.1-pre.1104",
-    "@openmrs/esm-error-handling": "^3.2.1-pre.1104",
-    "@openmrs/esm-extensions": "^3.2.1-pre.1104",
-    "@openmrs/esm-globals": "^3.2.1-pre.1104",
+    "@openmrs/esm-api": "^3.2.1-pre.1111",
+    "@openmrs/esm-config": "^3.2.1-pre.1111",
+    "@openmrs/esm-error-handling": "^3.2.1-pre.1111",
+    "@openmrs/esm-extensions": "^3.2.1-pre.1111",
+    "@openmrs/esm-globals": "^3.2.1-pre.1111",
     "dayjs": "^1.10.8",
     "i18next": "^19.6.0",
     "react": "^16.13.1",
@@ -68,5 +68,5 @@
     "rxjs": "^6.5.3",
     "unistore": "^3.5.2"
   },
-  "gitHead": "6c6f028f0195870cd70f0b3550ae5f57c59eb15a"
+  "gitHead": "811783b51250ea3f1e50e04e4139bb3362ddfb1a"
 }

package/src/useSessionUser.tsx

@@ -1,21 +1,21 @@
 /** @module @category API */
-import { openmrsObservableFetch, SessionUser } from "@openmrs/esm-api";
+import { getCurrentUser, Session } from "@openmrs/esm-api";
 import { useState, useEffect } from "react";
 
-export function useSessionUser() {
-  const [sessionUser, setSessionUser] = useState<SessionUser | null>(null);
+export function useSession() {
+  const [session, setSession] = useState<Session | null>(null);
 
   useEffect(() => {
-    if (sessionUser === null) {
-      const sub = openmrsObservableFetch("/ws/rest/v1/session").subscribe(
-        (user: any) => {
-          setSessionUser(user.data);
-        }
-      );
+    const sub = getCurrentUser({ includeAuthStatus: true }).subscribe(
+      (session) => setSession(session)
+    );
 
-      return () => sub.unsubscribe();
-    }
-  }, [sessionUser]);
+    return () => sub.unsubscribe();
+  }, [setSession]);
 
-  return sessionUser;
+  return session;
 }
+
+/** @deprecated */
+// maintain alias for backwards compatibility
+export const useSessionUser = useSession;

package/webpack.config.js

@@ -19,7 +19,7 @@ module.exports = (env) => ({
       {
         test: /\.m?(js|ts|tsx)$/,
         exclude: /(node_modules|bower_components)/,
-        use: "babel-loader",
+        use: "swc-loader",
       },
     ],
   },

package/.babelrc

@@ -1,8 +0,0 @@
-{
-  "presets": [
-    "@babel/preset-env",
-    "@babel/preset-typescript",
-    "@babel/preset-react"
-  ],
-  "plugins": ["@babel/plugin-proposal-class-properties"]
-}

package/babel.config.js

@@ -1,3 +0,0 @@
-const { readFileSync } = require("fs");
-
-module.exports = JSON.parse(readFileSync("./.babelrc", "utf8"));