@equinor/fusion-framework-react-app 1.0.2 → 1.0.3

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

@@ -7,7 +7,7 @@ export declare type ComponentRenderArgs<TFusion extends Fusion = Fusion, TManife
     fusion: TFusion;
     env: TManifest;
 };
-export declare type ComponentRenderer<TFusion extends Fusion = Fusion, TManifest extends AppManifest = AppManifest> = (args: ComponentRenderArgs<TFusion, TManifest>) => React.LazyExoticComponent<React.ComponentType>;
+export declare type ComponentRenderer<TFusion extends Fusion = Fusion, TManifest extends AppManifest = AppManifest> = (fusion: TFusion, env: TManifest) => React.LazyExoticComponent<React.ComponentType>;
 export declare const createComponent: <TModules extends AnyModule[], TRef extends Fusion<[]> = Fusion<[]>, TManifest extends AppManifest = AppManifest>(Component: React.ComponentType, configure?: AppModuleInitiator<TModules, TRef, TManifest> | undefined) => ComponentRenderer<TRef, TManifest>;
 declare module '@equinor/fusion-framework-module-event' {
     interface FrameworkEventMap {

package/dist/types/render-component.d.ts

@@ -1,4 +1,4 @@
-import type { ComponentRenderArgs, ComponentRenderer } from 'create-component';
+import type { ComponentRenderArgs, ComponentRenderer } from './create-component';
 export declare type RenderTeardown = VoidFunction;
 export declare const renderComponent: (renderer: ComponentRenderer) => (el: HTMLElement, args: ComponentRenderArgs) => RenderTeardown;
 export default renderComponent;

package/dist/types/useAppModule.d.ts

@@ -1,3 +1,3 @@
 import type { AppModulesInstance } from '@equinor/fusion-framework-app';
-export declare const useAppModule: <TKey extends "dispose" | "auth" | "event" | "http">(module: TKey) => AppModulesInstance<[]>[TKey];
+export declare const useAppModule: <TKey extends "event" | "dispose" | "http" | "auth" | "appConfig">(module: TKey) => AppModulesInstance<unknown>[TKey];
 export default useAppModule;

package/dist/types/useAppModules.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/fusion-framework-react-app",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "",
   "main": "dist/esm/index.js",
   "exports": {
@@ -39,12 +39,12 @@
     "directory": "packages/react"
   },
   "dependencies": {
-    "@equinor/fusion-framework-app": "^1.0.2",
-    "@equinor/fusion-framework-module": "^1.1.0",
-    "@equinor/fusion-framework-module-event": "^1.0.2",
-    "@equinor/fusion-framework-module-msal": "^1.0.2",
-    "@equinor/fusion-framework-react": "^1.0.2",
-    "@equinor/fusion-framework-react-module-app-config": "^1.0.2"
+    "@equinor/fusion-framework-app": "^1.0.3",
+    "@equinor/fusion-framework-module": "^1.1.1",
+    "@equinor/fusion-framework-module-event": "^1.0.3",
+    "@equinor/fusion-framework-module-msal": "^1.0.3",
+    "@equinor/fusion-framework-react": "^1.0.3",
+    "@equinor/fusion-framework-react-module-app-config": "^1.0.3"
   },
   "devDependencies": {
     "@types/react": "^17.0.11",
@@ -66,5 +66,5 @@
       "optional": true
     }
   },
-  "gitHead": "e4865f46e0e01bb8efdbe0a542e052255ec570a8"
+  "gitHead": "ed86940ac2091df63390cebd4c34d54ad02ed3fc"
 }

package/src/create-component.tsx

@@ -20,12 +20,11 @@ export type ComponentRenderArgs<
     TFusion extends Fusion = Fusion,
     TManifest extends AppManifest = AppManifest
 > = { fusion: TFusion; env: TManifest };
+
 export type ComponentRenderer<
     TFusion extends Fusion = Fusion,
     TManifest extends AppManifest = AppManifest
-> = (
-    args: ComponentRenderArgs<TFusion, TManifest>
-) => React.LazyExoticComponent<React.ComponentType>;
+> = (fusion: TFusion, env: TManifest) => React.LazyExoticComponent<React.ComponentType>;
 
 /**
  * Creates an lazy loading Component which configures modules
@@ -85,9 +84,9 @@ export const createComponent =
         Component: React.ComponentType,
         configure?: AppModuleInitiator<TModules, TRef, TManifest>
     ): ComponentRenderer<TRef, TManifest> =>
-    ({ fusion, env }) =>
+    (fusion, env) =>
         lazy(async () => {
-            const init = initAppModules(configure);
+            const init = initAppModules<TModules, TRef, TManifest>(configure);
             const modules = (await init({
                 fusion,
                 manifest: env,

package/src/create-legacy-app.tsx

@@ -15,7 +15,7 @@ export const createLegacyApp = <TModules extends Array<AnyModule>>(
         const fusion = useFramework();
         const RenderComponent = useMemo(() => {
             const creator = createComponent(Component, configure);
-            return creator({ fusion, env: { name: 'legacy' } });
+            return creator(fusion, { name: 'legacy' });
         }, []);
         return (
             <Suspense fallback={<p>loading app</p>}>

package/src/render-component.tsx

@@ -1,23 +1,18 @@
 import { Suspense, StrictMode } from 'react';
 import type { FunctionComponent } from 'react';
-import type { ComponentRenderArgs, ComponentRenderer } from 'create-component';
+import type { ComponentRenderArgs, ComponentRenderer } from './create-component';
 import ReactDOM from 'react-dom';
 
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { createRoot } from 'react-dom/client';
-
 export type RenderTeardown = VoidFunction;
 
 export const renderComponent = (renderer: ComponentRenderer) => {
     return (el: HTMLElement, args: ComponentRenderArgs): RenderTeardown => {
-        const Component = renderer(args);
-        const renderFn = createRoot ? render : renderLegacy;
-        return renderFn(el, Component);
+        const Component = renderer(args.fusion, args.env);
+        return render(el, Component);
     };
 };
 
-const renderLegacy = (el: Element, Component: FunctionComponent): RenderTeardown => {
+const render = (el: Element, Component: FunctionComponent): RenderTeardown => {
     ReactDOM.render(
         <StrictMode>
             <Suspense fallback={<p>loading app</p>}>
@@ -31,18 +26,18 @@ const renderLegacy = (el: Element, Component: FunctionComponent): RenderTeardown
     };
 };
 
-const render = (el: Element, Component: FunctionComponent): RenderTeardown => {
-    const root = createRoot(el);
-    root.render(
-        <StrictMode>
-            <Suspense fallback={<p>loading app</p>}>
-                <Component />
-            </Suspense>
-        </StrictMode>
-    );
-    return () => {
-        root.unmount();
-    };
-};
+// const render = (el: Element, Component: FunctionComponent): RenderTeardown => {
+//     const root = createRoot(el);
+//     root.render(
+//         <StrictMode>
+//             <Suspense fallback={<p>loading app</p>}>
+//                 <Component />
+//             </Suspense>
+//         </StrictMode>
+//     );
+//     return () => {
+//         root.unmount();
+//     };
+// };
 
 export default renderComponent;

package/dist/esm/create-app.js

@@ -1,24 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { lazy } from 'react';
-import { FrameworkProvider } from '@equinor/fusion-framework-react';
-import { initializeAppModules } from '@equinor/fusion-framework-app';
-import { ModuleProvider as AppModuleProvider } from '@equinor/fusion-framework-react-module';
-export const createApp = (Component, configure, modules) => (fusion, env) => lazy(async () => {
-    modules ??= [];
-    const configurator = async (config) => {
-        if (configure) {
-            await Promise.resolve(configure(config, fusion, env));
-        }
-    };
-    const appInitiator = initializeAppModules(configurator, modules ?? []);
-    const appModules = await appInitiator(fusion, env);
-    appModules.event.dispatchEvent('onReactAppLoaded', {
-        detail: { modules, fusion },
-        source: Component,
-    });
-    return {
-        default: () => (_jsx(FrameworkProvider, { value: fusion, children: _jsx(AppModuleProvider, { value: appModules, children: _jsx(Component, {}) }) })),
-    };
-});
-export default createApp;
-//# sourceMappingURL=create-app.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"create-app.js","sourceRoot":"","sources":["../../src/create-app.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAE7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAGpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAOrE,OAAO,EAAE,cAAc,IAAI,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAmD7F,MAAM,CAAC,MAAM,SAAS,GAClB,CACI,SAA8B,EAC9B,SAAqC,EACrC,OAAkB,EACpB,EAAE,CACJ,CAAC,MAAc,EAAE,GAAgB,EAAkD,EAAE,CACjF,IAAI,CAAC,KAAK,IAAI,EAAE;IACZ,OAAO,KAAK,EAAyB,CAAC;IAEtC,MAAM,YAAY,GAAG,KAAK,EAAE,MAAW,EAAE,EAAE;QACvC,IAAI,SAAS,EAAE;YACX,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;SACzD;IACL,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,oBAAoB,CAAC,YAAY,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC;IAEvE,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACnD,UAAU,CAAC,KAAK,CAAC,aAAa,CAAC,kBAAkB,EAAE;QAC/C,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;QAC3B,MAAM,EAAE,SAAS;KACpB,CAAC,CAAC;IACH,OAAO;QACH,OAAO,EAAE,GAAG,EAAE,CAAC,CACX,KAAC,iBAAiB,IAAC,KAAK,EAAE,MAAM,YAC5B,KAAC,iBAAiB,IAAC,KAAK,EAAE,UAAU,YAChC,KAAC,SAAS,KAAG,GACG,GACJ,CACvB;KACJ,CAAC;AACN,CAAC,CAAC,CAAC;AAaX,eAAe,SAAS,CAAC"}

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

@@ -1,15 +0,0 @@
-/// <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;