@equinor/fusion-framework-react-app 0.7.0-0 → 0.7.2

package/dist/types/framework/index.d.ts

@@ -1 +1 @@
-export { useCurrentUser, useFramework, useHttpClient } from '@equinor/fusion-framework-react/hooks';
+export { useCurrentUser, useFramework, useHttpClient as useFrameworkHttpClient, } from '@equinor/fusion-framework-react/hooks';

package/dist/types/http/index.d.ts

@@ -1,2 +1 @@
-export { IHttpClient, HttpClientMsal, FetchRequestInit, } from '@equinor/fusion-framework-module-http';
-export { useHttpClient } from './useHttpClient';
+export * from '@equinor/fusion-framework-react/http';

package/dist/types/index.d.ts

@@ -1,7 +1,6 @@
 export { appModules } from '@equinor/fusion-framework-app';
-export type { AppConfigurator, AppModules, AppModulesInstance, AppManifest, } from '@equinor/fusion-framework-app';
+export type { AppConfigurator, AppConfigCallback, AppModules, AppModulesInstance, AppManifest, } from '@equinor/fusion-framework-app';
 export { useAppModule } from './useAppModule';
 export { useAppModules } from './useAppModules';
 export { createApp } from './create-app';
-export { createLegacyApp } from './create-legacy-app';
 export { default } from './create-app';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/fusion-framework-react-app",
-  "version": "0.7.0-0",
+  "version": "0.7.2",
   "description": "",
   "main": "dist/esm/index.js",
   "exports": {
@@ -39,22 +39,19 @@
     "directory": "packages/react"
   },
   "dependencies": {
-    "@equinor/fusion-framework": "^3.0.0",
-    "@equinor/fusion-framework-app": "^0.2.0",
-    "@equinor/fusion-framework-module": "^0.4.2",
-    "@equinor/fusion-framework-module-event": "^0.1.2",
-    "@equinor/fusion-framework-module-http": "^1.0.0",
-    "@equinor/fusion-framework-module-msal": "^0.4.0",
-    "@equinor/fusion-framework-react": "^0.2.19",
-    "@equinor/fusion-framework-react-module-app-config": "^0.1.4",
-    "@equinor/fusion-observable": "^0.3.0"
+    "@equinor/fusion-framework-app": "^0.2.2",
+    "@equinor/fusion-framework-module": "^0.4.3",
+    "@equinor/fusion-framework-module-event": "^0.1.3",
+    "@equinor/fusion-framework-module-msal": "^0.4.1",
+    "@equinor/fusion-framework-react": "^0.3.2",
+    "@equinor/fusion-framework-react-module-app-config": "^0.1.6"
   },
   "devDependencies": {
     "@types/react": "^17.0.11",
     "@types/react-dom": "^17.0.7",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "typescript": "^4.7.4"
+    "typescript": "^4.8.2"
   },
   "peerDependencies": {
     "@types/react": "^16.9.0 || ^17.0.0 || ^18.0.0",
@@ -68,5 +65,6 @@
     "react-dom": {
       "optional": true
     }
-  }
+  },
+  "gitHead": "3f2046693f0bbae193616f29444dd95efb101c16"
 }

package/src/framework/index.ts

@@ -1 +1,5 @@
-export { useCurrentUser, useFramework, useHttpClient } from '@equinor/fusion-framework-react/hooks';
+export {
+    useCurrentUser,
+    useFramework,
+    useHttpClient as useFrameworkHttpClient,
+} from '@equinor/fusion-framework-react/hooks';

package/src/http/index.ts

@@ -1,7 +1 @@
-export {
-    IHttpClient,
-    HttpClientMsal,
-    FetchRequestInit,
-} from '@equinor/fusion-framework-module-http';
-
-export { useHttpClient } from './useHttpClient';
+export * from '@equinor/fusion-framework-react/http';

package/src/index.ts

@@ -7,6 +7,7 @@ export { appModules } from '@equinor/fusion-framework-app';
 
 export type {
     AppConfigurator,
+    AppConfigCallback,
     AppModules,
     AppModulesInstance,
     AppManifest,
@@ -16,6 +17,5 @@ export { useAppModule } from './useAppModule';
 export { useAppModules } from './useAppModules';
 
 export { createApp } from './create-app';
-export { createLegacyApp } from './create-legacy-app';
 
 export { default } from './create-app';

package/tsconfig.json

@@ -9,10 +9,7 @@
   },
   "references": [
     {
-      "path": "../observable"
-    },
-    {
-      "path": "../framework"
+      "path": "../module"
     },
     {
       "path": "../app"
@@ -23,9 +20,6 @@
     {
       "path": "../module"
     },
-    {
-      "path": "../module-http"
-    },
     {
       "path": "../module-msal"
     },

package/dist/esm/create-legacy-app.js

@@ -1,15 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { Suspense, useMemo } from 'react';
-import { useFramework } from '@equinor/fusion-framework-react/hooks';
-import { createApp } from './create-app';
-export const createLegacyApp = (Component, configure, modules) => {
-    return () => {
-        const fusion = useFramework();
-        const RenderComponent = useMemo(() => {
-            const creator = createApp(Component, configure, modules);
-            return creator(fusion, { name: '' });
-        }, []);
-        return (_jsx(Suspense, { fallback: _jsx("p", { children: "loading app" }), children: _jsx(RenderComponent, {}) }));
-    };
-};
-//# sourceMappingURL=create-legacy-app.js.map

package/dist/esm/create-legacy-app.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"create-legacy-app.js","sourceRoot":"","sources":["../../src/create-legacy-app.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AAKrE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,CAAC,MAAM,eAAe,GAAG,CAC3B,SAA8B,EAC9B,SAAqC,EACrC,OAAkB,EACpB,EAAE;IACA,OAAO,GAAgB,EAAE;QACrB,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC;QAC9B,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,EAAE;YACjC,MAAM,OAAO,GAAG,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;YACzD,OAAO,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QACzC,CAAC,EAAE,EAAE,CAAC,CAAC;QACP,OAAO,CACH,KAAC,QAAQ,IAAC,QAAQ,EAAE,sCAAkB,YAClC,KAAC,eAAe,KAAG,GACZ,CACd,CAAC;IACN,CAAC,CAAC;AACN,CAAC,CAAC"}

package/dist/esm/http/useHttpClient.js

@@ -1,14 +0,0 @@
-import { useMemo } from 'react';
-import { useAppModule } from '../useAppModule';
-export const useHttpClient = (name) => {
-    const http = useAppModule('http');
-    const client = useMemo(() => {
-        if (http.hasClient(name)) {
-            return http.createClient(name);
-        }
-        throw Error(`no configured client for key [${name}]`);
-    }, [name]);
-    return client;
-};
-export default useHttpClient;
-//# sourceMappingURL=useHttpClient.js.map

package/dist/esm/http/useHttpClient.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useHttpClient.js","sourceRoot":"","sources":["../../../src/http/useHttpClient.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAa/C,MAAM,CAAC,MAAM,aAAa,GAAG,CAA6C,IAAY,EAAS,EAAE;IAC7F,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IAClC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE;QACxB,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;YACtB,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;SAClC;QACD,MAAM,KAAK,CAAC,iCAAiC,IAAI,GAAG,CAAC,CAAC;IAC1D,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,OAAO,MAA0B,CAAC;AACtC,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/dist/types/create-legacy-app.d.ts

@@ -1,3 +0,0 @@
-import type { AnyModule } from '@equinor/fusion-framework-module';
-import type { AppConfigurator } from '@equinor/fusion-framework-app';
-export declare const createLegacyApp: <TModules extends AnyModule[]>(Component: React.ComponentType, configure?: AppConfigurator<TModules> | undefined, modules?: TModules | undefined) => () => JSX.Element;

package/dist/types/http/useHttpClient.d.ts

@@ -1,8 +0,0 @@
-import { HttpClientMsal, IHttpClient } from '@equinor/fusion-framework-module-http';
-export declare const useHttpClient: <TType extends IHttpClient<import("@equinor/fusion-framework-module-http").FetchRequest, Response> = HttpClientMsal<RequestInit & {
-    uri: string;
-    path: string;
-} & {
-    scopes?: string[] | undefined;
-}, Response>>(name: string) => TType;
-export default useHttpClient;

package/src/create-legacy-app.tsx

@@ -1,27 +0,0 @@
-import { Suspense, useMemo } from 'react';
-
-import { useFramework } from '@equinor/fusion-framework-react/hooks';
-
-import type { AnyModule } from '@equinor/fusion-framework-module';
-import type { AppConfigurator } from '@equinor/fusion-framework-app';
-
-import { createApp } from './create-app';
-
-export const createLegacyApp = <TModules extends Array<AnyModule>>(
-    Component: React.ComponentType,
-    configure?: AppConfigurator<TModules>,
-    modules?: TModules
-) => {
-    return (): JSX.Element => {
-        const fusion = useFramework();
-        const RenderComponent = useMemo(() => {
-            const creator = createApp(Component, configure, modules);
-            return creator(fusion, { name: '' });
-        }, []);
-        return (
-            <Suspense fallback={<p>loading app</p>}>
-                <RenderComponent />
-            </Suspense>
-        );
-    };
-};

package/src/http/useHttpClient.ts

@@ -1,29 +0,0 @@
-/* eslint-disable @typescript-eslint/ban-types */
-import { HttpClientMsal, IHttpClient } from '@equinor/fusion-framework-module-http';
-import { useMemo } from 'react';
-import { useAppModule } from '../useAppModule';
-
-/**
- * Use a configured client from application modules
- *
- * creates a new client from configured client by name and memorizes the instance.
- * if provided name changes a new client will be created
- *
- * @see {@link IHttpClient}
- * @see {@link @equinor/fusion-framework-module-http.IHttpClientConfigurator.configureClient|configureClient}
- * @template TType type-hint return type, useful if custom Ctor is provided in config
- * @param name Named client from configuration
- */
-export const useHttpClient = <TType extends IHttpClient = HttpClientMsal>(name: string): TType => {
-    const http = useAppModule('http');
-    const client = useMemo(() => {
-        if (http.hasClient(name)) {
-            return http.createClient(name);
-        }
-        throw Error(`no configured client for key [${name}]`);
-    }, [name]);
-    // TODO - abort on unmount?
-    return client as unknown as TType;
-};
-
-export default useHttpClient;