@equinor/fusion-framework-react-app 0.4.2 → 0.5.0

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

@@ -1 +1,2 @@
-export { AppConfig, useAppConfig, UseAppConfigResult, useAppConfig$, UseAppConfigStreamResult, } from '@equinor/fusion-framework-react-module-app-config';
+export { useAppConfig, useAppConfig$ } from '@equinor/fusion-framework-react-module-app-config';
+export type { AppConfig, UseAppConfigResult, UseAppConfigStreamResult, } from '@equinor/fusion-framework-react-module-app-config';

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

@@ -1,8 +1,15 @@
-import type { Fusion, AppManifest } from '@equinor/fusion-framework';
-import { AnyModule, ModulesConfigType } from '@equinor/fusion-framework-module';
-import { AppModules } from './modules';
-export interface AppConfigurator<TModules extends Array<AnyModule> = []> {
-    (config: ModulesConfigType<AppModules> & ModulesConfigType<TModules>, fusion: Fusion, env: AppManifest): void | Promise<void>;
-}
+/// <reference types="react" />
+import type { Fusion } from '@equinor/fusion-framework-react';
+import type { AppManifest, AppConfigurator, AppModules } from '@equinor/fusion-framework-app';
+import type { AnyModule, ModulesInstanceType } from '@equinor/fusion-framework-module';
+import type { FrameworkEvent, FrameworkEventInit } from '@equinor/fusion-framework-module-event';
 export declare const createApp: <TModules extends AnyModule[]>(Component: React.ComponentType, configure?: AppConfigurator<TModules> | undefined, modules?: TModules | undefined) => (fusion: Fusion, env: AppManifest) => React.LazyExoticComponent<React.ComponentType>;
+declare module '@equinor/fusion-framework-module-event' {
+    interface FrameworkEventMap {
+        onReactAppLoaded: FrameworkEvent<FrameworkEventInit<{
+            modules: ModulesInstanceType<AppModules>;
+            fusion: Fusion;
+        }, React.ComponentType>>;
+    }
+}
 export default createApp;

package/dist/types/index.d.ts

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

package/dist/types/useAppModule.d.ts

@@ -0,0 +1,3 @@
+import type { AppModulesInstance } from '@equinor/fusion-framework-app';
+export declare const useAppModule: <TKey extends string | number>(module: TKey) => AppModulesInstance<[]>[TKey];
+export default useAppModule;

package/dist/types/useAppModules.d.ts

@@ -0,0 +1,3 @@
+import type { AppModulesInstance } from '@equinor/fusion-framework-app';
+export declare const useAppModules: () => AppModulesInstance<[]>;
+export default useAppModules;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/fusion-framework-react-app",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "",
   "main": "dist/esm/index.js",
   "exports": {
@@ -39,13 +39,15 @@
     "directory": "packages/react"
   },
   "dependencies": {
-    "@equinor/fusion-framework": "^2.0.1",
-    "@equinor/fusion-framework-module": "^0.4.1",
-    "@equinor/fusion-framework-module-http": "^0.6.1",
-    "@equinor/fusion-framework-module-msal": "^0.3.1",
-    "@equinor/fusion-framework-react": "^0.2.15",
-    "@equinor/fusion-framework-react-module-app-config": "^0.1.2",
-    "@equinor/fusion-observable": "^0.1.3"
+    "@equinor/fusion-framework": "^2.1.0",
+    "@equinor/fusion-framework-app": "^0.1.1",
+    "@equinor/fusion-framework-module": "^0.4.2",
+    "@equinor/fusion-framework-module-event": "^0.1.1",
+    "@equinor/fusion-framework-module-http": "^0.6.2",
+    "@equinor/fusion-framework-module-msal": "^0.3.2",
+    "@equinor/fusion-framework-react": "^0.2.17",
+    "@equinor/fusion-framework-react-module-app-config": "^0.1.3",
+    "@equinor/fusion-observable": "^0.3.0"
   },
   "devDependencies": {
     "@types/react": "^17.0.11",
@@ -67,5 +69,5 @@
       "optional": true
     }
   },
-  "gitHead": "293ea245afed24ebcbbf04cb4be66210d7705af9"
+  "gitHead": "4a8883c57421b9353676a9972179321c59b48ed7"
 }

package/src/config/index.ts

@@ -1,7 +1,7 @@
-export {
+export { useAppConfig, useAppConfig$ } from '@equinor/fusion-framework-react-module-app-config';
+
+export type {
     AppConfig,
-    useAppConfig,
     UseAppConfigResult,
-    useAppConfig$,
     UseAppConfigStreamResult,
 } from '@equinor/fusion-framework-react-module-app-config';

package/src/create-app.tsx

@@ -1,36 +1,16 @@
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { lazy } from 'react';
 
-import type { Fusion, AppManifest } from '@equinor/fusion-framework';
-import FrameworkProvider from '@equinor/fusion-framework-react';
+import { FrameworkProvider } from '@equinor/fusion-framework-react';
+import type { Fusion } from '@equinor/fusion-framework-react';
 
-import { AnyModule, ModulesConfigType } from '@equinor/fusion-framework-module';
+import { initializeAppModules } from '@equinor/fusion-framework-app';
+import type { AppManifest, AppConfigurator, AppModules } from '@equinor/fusion-framework-app';
 
-import { appModules, AppModules } from './modules';
+import type { AnyModule, ModulesInstanceType } from '@equinor/fusion-framework-module';
 
-import { createModuleProvider } from '@equinor/fusion-framework-react-module';
+import type { FrameworkEvent, FrameworkEventInit } from '@equinor/fusion-framework-module-event';
 
-/**
- * Interface for type hinting configuration callbacks
- * @example
- * ```ts
- * const configCallback: AppConfigurator = (configurator) => {
- *  configurator.http.configureClient(
- *     'bar', {
- *       baseUri: 'https://somewhere-test.com',
- *       defaultScopes: ['foo/.default']
- *     }
- *   );
- * };
- * ```
- */
-export interface AppConfigurator<TModules extends Array<AnyModule> = []> {
-    (
-        config: ModulesConfigType<AppModules> & ModulesConfigType<TModules>,
-        fusion: Fusion,
-        env: AppManifest
-    ): void | Promise<void>;
-}
+import { ModuleProvider as AppModuleProvider } from '@equinor/fusion-framework-react-module';
 
 /**
  * Creates an lazy loading Component which configures modules
@@ -96,18 +76,18 @@ export const createApp =
                     await Promise.resolve(configure(config, fusion, env));
                 }
             };
-            const AppModuleProvider = await createModuleProvider(
-                configurator,
-                // TODO type hint concat of modules
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore
-                appModules.concat(modules),
-                fusion.modules
-            );
+
+            const appInitiator = initializeAppModules(configurator, modules ?? []);
+
+            const appModules = await appInitiator(fusion, env);
+            appModules.event.dispatchEvent('onReactAppLoaded', {
+                detail: { modules, fusion },
+                source: Component,
+            });
             return {
                 default: () => (
                     <FrameworkProvider value={fusion}>
-                        <AppModuleProvider>
+                        <AppModuleProvider value={appModules}>
                             <Component />
                         </AppModuleProvider>
                     </FrameworkProvider>
@@ -115,4 +95,15 @@ export const createApp =
             };
         });
 
+declare module '@equinor/fusion-framework-module-event' {
+    interface FrameworkEventMap {
+        onReactAppLoaded: FrameworkEvent<
+            FrameworkEventInit<
+                { modules: ModulesInstanceType<AppModules>; fusion: Fusion },
+                React.ComponentType
+            >
+        >;
+    }
+}
+
 export default createApp;

package/src/http/useHttpClient.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/ban-types */
 import { HttpClientMsal, IHttpClient } from '@equinor/fusion-framework-module-http';
 import { useMemo } from 'react';
-import { useAppModule } from '../modules';
+import { useAppModule } from '../useAppModule';
 
 /**
  * Use a configured client from application modules

package/src/index.ts

@@ -3,5 +3,18 @@
  * @module
  */
 
-export { AppConfigurator, createApp, default } from './create-app';
-export { AppModules, AppModulesInstance, appModules, useAppModule, useAppModules } from './modules';
+export { appModules } from '@equinor/fusion-framework-app';
+
+export type {
+    AppConfigurator,
+    AppModules,
+    AppModulesInstance,
+    AppManifest,
+} from '@equinor/fusion-framework-app';
+
+export { useAppModule } from './useAppModule';
+export { useAppModules } from './useAppModules';
+
+export { createApp } from './create-app';
+
+export { default } from './create-app';

package/src/useAppModule.ts

@@ -0,0 +1,8 @@
+import type { AppModulesInstance } from '@equinor/fusion-framework-app';
+import { useAppModules } from './useAppModules';
+
+export const useAppModule = <TKey extends keyof AppModulesInstance>(
+    module: TKey
+): AppModulesInstance[TKey] => useAppModules()[module];
+
+export default useAppModule;

package/src/useAppModules.ts

@@ -0,0 +1,6 @@
+import type { AppModulesInstance } from '@equinor/fusion-framework-app';
+import { useModules } from '@equinor/fusion-framework-react-module';
+
+export const useAppModules = useModules<AppModulesInstance>;
+
+export default useAppModules;

package/tsconfig.json

@@ -14,6 +14,9 @@
     {
       "path": "../framework"
     },
+    {
+      "path": "../app"
+    },
     {
       "path": "../framework-react"
     },
@@ -26,6 +29,9 @@
     {
       "path": "../module-msal"
     },
+    {
+      "path": "../module-event"
+    },
     {
       "path": "../react-module"
     },

package/dist/esm/modules.js

@@ -1,8 +0,0 @@
-import http from '@equinor/fusion-framework-module-http';
-import msal from '@equinor/fusion-framework-module-msal';
-import appConfig from '@equinor/fusion-framework-react-module-app-config';
-import { useModules } from '@equinor/fusion-framework-react-module';
-export const appModules = [http, msal, appConfig];
-export const useAppModules = (useModules);
-export const useAppModule = (module) => useAppModules()[module];
-//# sourceMappingURL=modules.js.map

package/dist/esm/modules.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"modules.js","sourceRoot":"","sources":["../../src/modules.tsx"],"names":[],"mappings":"AAEA,OAAO,IAAoB,MAAM,uCAAuC,CAAC;AACzE,OAAO,IAAoB,MAAM,uCAAuC,CAAC;AACzE,OAAO,SAA8B,MAAM,mDAAmD,CAAC;AAE/F,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAKpE,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;AAElD,MAAM,CAAC,MAAM,aAAa,GAAG,CAAA,UAA8B,CAAA,CAAC;AAC5D,MAAM,CAAC,MAAM,YAAY,GAAG,CACxB,MAAY,EACY,EAAE,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC"}

package/dist/esm/types.js

@@ -1,2 +0,0 @@
-"use strict";
-//# sourceMappingURL=types.js.map

package/dist/esm/types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":""}

package/dist/types/modules.d.ts

@@ -1,17 +0,0 @@
-import { ModulesInstanceType } from '@equinor/fusion-framework-module';
-import { HttpModule } from '@equinor/fusion-framework-module-http';
-import { MsalModule } from '@equinor/fusion-framework-module-msal';
-import { AppConfigModule } from '@equinor/fusion-framework-react-module-app-config';
-export declare type AppModules = [HttpModule, MsalModule, AppConfigModule];
-export declare type AppModulesInstance = ModulesInstanceType<AppModules>;
-export declare const appModules: (HttpModule | MsalModule | AppConfigModule)[];
-export declare const useAppModules: () => {
-    http: import("@equinor/fusion-framework-module-http").IHttpClientProvider<import("@equinor/fusion-framework-module-http").IHttpClient<import("@equinor/fusion-framework-module-http").FetchRequest, Response>>;
-    auth: import("@equinor/fusion-framework-module-msal").IAuthProvider;
-    appConfig: import("@equinor/fusion-framework-react-module-app-config").IAppConfigProvider<unknown>;
-};
-export declare const useAppModule: <TKey extends "http" | "auth" | "appConfig">(module: TKey) => {
-    http: import("@equinor/fusion-framework-module-http").IHttpClientProvider<import("@equinor/fusion-framework-module-http").IHttpClient<import("@equinor/fusion-framework-module-http").FetchRequest, Response>>;
-    auth: import("@equinor/fusion-framework-module-msal").IAuthProvider;
-    appConfig: import("@equinor/fusion-framework-react-module-app-config").IAppConfigProvider<unknown>;
-}[TKey];

package/src/modules.tsx

@@ -1,17 +0,0 @@
-import { ModulesInstanceType } from '@equinor/fusion-framework-module';
-
-import http, { HttpModule } from '@equinor/fusion-framework-module-http';
-import msal, { MsalModule } from '@equinor/fusion-framework-module-msal';
-import appConfig, { AppConfigModule } from '@equinor/fusion-framework-react-module-app-config';
-
-import { useModules } from '@equinor/fusion-framework-react-module';
-
-export type AppModules = [HttpModule, MsalModule, AppConfigModule];
-export type AppModulesInstance = ModulesInstanceType<AppModules>;
-
-export const appModules = [http, msal, appConfig];
-
-export const useAppModules = useModules<AppModulesInstance>;
-export const useAppModule = <TKey extends keyof AppModulesInstance>(
-    module: TKey
-): AppModulesInstance[TKey] => useAppModules()[module];