@equinor/fusion-framework-react-app 1.0.19 → 1.0.21

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

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

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

@@ -1,14 +1,15 @@
 import React from 'react';
 import type { Fusion } from '@equinor/fusion-framework-react';
-import type { AppManifest, AppModuleInitiator, AppModulesInstance } from '@equinor/fusion-framework-app';
+import { AppEnv } from '@equinor/fusion-framework-app';
+import type { AppModuleInitiator, AppModulesInstance } from '@equinor/fusion-framework-app';
 import type { AnyModule } from '@equinor/fusion-framework-module';
 import type { FrameworkEvent, FrameworkEventInit } from '@equinor/fusion-framework-module-event';
-export declare type ComponentRenderArgs<TFusion extends Fusion = Fusion, TManifest extends AppManifest = AppManifest> = {
+export declare type ComponentRenderArgs<TFusion extends Fusion = Fusion, TEnv = AppEnv> = {
     fusion: TFusion;
-    env: TManifest;
+    env: TEnv;
 };
-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>;
+export declare type ComponentRenderer<TFusion extends Fusion = Fusion, TEnv = AppEnv> = (fusion: TFusion, env: TEnv) => React.LazyExoticComponent<React.ComponentType>;
+export declare const createComponent: <TModules extends AnyModule[], TRef extends Fusion<[]> = Fusion<[]>, TEnv extends AppEnv<unknown, unknown> = AppEnv<unknown, unknown>>(Component: React.ComponentType, configure?: AppModuleInitiator<TModules, TRef, TEnv> | undefined) => ComponentRenderer<TRef, TEnv>;
 declare module '@equinor/fusion-framework-module-event' {
     interface FrameworkEventMap {
         onReactAppLoaded: FrameworkEvent<FrameworkEventInit<{

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

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import type { AnyModule } from '@equinor/fusion-framework-module';
 import type { AppModuleInitiator } from '@equinor/fusion-framework-app';
-export declare const createLegacyApp: <TModules extends AnyModule[]>(Component: React.ComponentType, configure?: AppModuleInitiator<TModules, import("@equinor/fusion-framework").Fusion<[]>, import("@equinor/fusion-framework-app").AppManifest> | undefined) => () => JSX.Element;
+export declare const createLegacyApp: <TModules extends AnyModule[]>(Component: React.ComponentType, configure?: AppModuleInitiator<TModules, import("@equinor/fusion-framework").Fusion<[]>, import("@equinor/fusion-framework-app").AppEnv<unknown, unknown>> | undefined) => () => JSX.Element;

package/dist/types/index.d.ts

@@ -5,4 +5,5 @@ export { renderApp } from './render-app';
 export { createComponent } from './create-component';
 export { renderComponent } from './render-component';
 export { createLegacyApp } from './create-legacy-app';
+export type { ComponentRenderArgs, ComponentRenderer } from './create-component';
 export { default } from './render-app';

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
 import { RenderTeardown } from './render-component';
 import type { ComponentRenderArgs } from './create-component';
-export declare const renderApp: (Component: import("react").ComponentType<{}>, configure?: import("@equinor/fusion-framework-app").AppModuleInitiator<import("@equinor/fusion-framework-module").AnyModule[], import("@equinor/fusion-framework").Fusion<[]>, import("@equinor/fusion-framework-app").AppManifest> | undefined) => (el: HTMLElement, args: ComponentRenderArgs) => RenderTeardown;
+export declare const renderApp: (Component: import("react").ComponentType<{}>, configure?: import("@equinor/fusion-framework-app").AppModuleInitiator<import("@equinor/fusion-framework-module").AnyModule[], import("@equinor/fusion-framework").Fusion<[]>, import("@equinor/fusion-framework-app").AppEnv<unknown, unknown>> | undefined) => (el: HTMLElement, args: ComponentRenderArgs) => RenderTeardown;
 export default renderApp;

package/package.json

@@ -1,71 +1,71 @@
 {
-  "name": "@equinor/fusion-framework-react-app",
-  "version": "1.0.19",
-  "description": "",
-  "main": "dist/esm/index.js",
-  "exports": {
-    ".": "./dist/esm/index.js",
-    "./config": "./dist/esm/config/index.js",
-    "./framework": "./dist/esm/framework/index.js",
-    "./http": "./dist/esm/http/index.js"
-  },
-  "types": "./dist/types/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "config": [
-        "dist/types/config/index.d.ts"
-      ],
-      "framework": [
-        "dist/types/framework/index.d.ts"
-      ],
-      "http": [
-        "dist/types/http/index.d.ts"
-      ]
-    }
-  },
-  "scripts": {
-    "build": "npm run build:typescript",
-    "build:typescript": "tsc -b --verbose"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/equinor/fusion-framework.git",
-    "directory": "packages/react"
-  },
-  "dependencies": {
-    "@equinor/fusion-framework-app": "^3.0.7",
-    "@equinor/fusion-framework-module": "^1.2.5",
-    "@equinor/fusion-framework-module-event": "^1.0.12",
-    "@equinor/fusion-framework-module-msal": "^1.0.13",
-    "@equinor/fusion-framework-react": "^1.0.16",
-    "@equinor/fusion-framework-react-module-app-config": "^1.0.14",
-    "@equinor/fusion-framework-react-module-http": "^1.0.13"
-  },
-  "devDependencies": {
-    "@types/react": "^17.0.11",
-    "@types/react-dom": "^17.0.7",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "typescript": "^4.8.4"
-  },
-  "peerDependencies": {
-    "@types/react": "^16.9.0 || ^17.0.0 || ^18.0.0",
-    "react": "^16.9.0 || ^17.0.0 || ^18.0.0",
-    "react-dom": "^16.9.0 || ^17.0.0 || ^18.0.0"
-  },
-  "peerDependenciesMeta": {
-    "@types/react": {
-      "optional": true
+    "name": "@equinor/fusion-framework-react-app",
+    "version": "1.0.21",
+    "description": "",
+    "main": "dist/esm/index.js",
+    "exports": {
+        ".": "./dist/esm/index.js",
+        "./config": "./dist/esm/config/index.js",
+        "./framework": "./dist/esm/framework/index.js",
+        "./http": "./dist/esm/http/index.js"
     },
-    "react-dom": {
-      "optional": true
-    }
-  },
-  "gitHead": "2dc8f66fd10dba532dba79e7b0b95e9953c51a29"
+    "types": "./dist/types/index.d.ts",
+    "typesVersions": {
+        "*": {
+            "config": [
+                "dist/types/config/index.d.ts"
+            ],
+            "framework": [
+                "dist/types/framework/index.d.ts"
+            ],
+            "http": [
+                "dist/types/http/index.d.ts"
+            ]
+        }
+    },
+    "scripts": {
+        "build": "npm run build:typescript",
+        "build:typescript": "tsc -b --verbose"
+    },
+    "keywords": [],
+    "author": "",
+    "license": "ISC",
+    "publishConfig": {
+        "access": "public"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/equinor/fusion-framework.git",
+        "directory": "packages/react"
+    },
+    "dependencies": {
+        "@equinor/fusion-framework-app": "^3.0.9",
+        "@equinor/fusion-framework-module": "^1.2.6",
+        "@equinor/fusion-framework-module-event": "^1.0.13",
+        "@equinor/fusion-framework-module-msal": "^1.0.14",
+        "@equinor/fusion-framework-react": "^1.0.17",
+        "@equinor/fusion-framework-react-module-app-config": "^1.0.15",
+        "@equinor/fusion-framework-react-module-http": "^1.0.14"
+    },
+    "devDependencies": {
+        "@types/react": "^17.0.11",
+        "@types/react-dom": "^17.0.7",
+        "react": "^17.0.2",
+        "react-dom": "^17.0.2",
+        "typescript": "^4.8.4"
+    },
+    "peerDependencies": {
+        "@types/react": "^16.9.0 || ^17.0.0 || ^18.0.0",
+        "react": "^16.9.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.9.0 || ^17.0.0 || ^18.0.0"
+    },
+    "peerDependenciesMeta": {
+        "@types/react": {
+            "optional": true
+        },
+        "react-dom": {
+            "optional": true
+        }
+    },
+    "gitHead": "2ad4d827ff390bbc3e45c2962598df918457f6e6"
 }

package/src/config/index.ts

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

package/src/create-component.tsx

@@ -3,12 +3,8 @@ import React, { lazy } from 'react';
 import { FrameworkProvider } from '@equinor/fusion-framework-react';
 import type { Fusion } from '@equinor/fusion-framework-react';
 
-import { configureModules } from '@equinor/fusion-framework-app';
-import type {
-    AppManifest,
-    AppModuleInitiator,
-    AppModulesInstance,
-} from '@equinor/fusion-framework-app';
+import { AppEnv, configureModules } from '@equinor/fusion-framework-app';
+import type { AppModuleInitiator, AppModulesInstance } from '@equinor/fusion-framework-app';
 
 import type { AnyModule } from '@equinor/fusion-framework-module';
 
@@ -16,15 +12,15 @@ import type { FrameworkEvent, FrameworkEventInit } from '@equinor/fusion-framewo
 
 import { ModuleProvider as AppModuleProvider } from '@equinor/fusion-framework-react-module';
 
-export type ComponentRenderArgs<
-    TFusion extends Fusion = Fusion,
-    TManifest extends AppManifest = AppManifest
-> = { fusion: TFusion; env: TManifest };
+export type ComponentRenderArgs<TFusion extends Fusion = Fusion, TEnv = AppEnv> = {
+    fusion: TFusion;
+    env: TEnv;
+};
 
-export type ComponentRenderer<
-    TFusion extends Fusion = Fusion,
-    TManifest extends AppManifest = AppManifest
-> = (fusion: TFusion, env: TManifest) => React.LazyExoticComponent<React.ComponentType>;
+export type ComponentRenderer<TFusion extends Fusion = Fusion, TEnv = AppEnv> = (
+    fusion: TFusion,
+    env: TEnv
+) => React.LazyExoticComponent<React.ComponentType>;
 
 /**
  * Creates an lazy loading Component which configures modules
@@ -76,20 +72,16 @@ export type ComponentRenderer<
  * @param modules - required modules for application
  */
 export const createComponent =
-    <
-        TModules extends Array<AnyModule>,
-        TRef extends Fusion = Fusion,
-        TManifest extends AppManifest = AppManifest
-    >(
+    <TModules extends Array<AnyModule>, TRef extends Fusion = Fusion, TEnv extends AppEnv = AppEnv>(
         Component: React.ComponentType,
-        configure?: AppModuleInitiator<TModules, TRef, TManifest>
-    ): ComponentRenderer<TRef, TManifest> =>
+        configure?: AppModuleInitiator<TModules, TRef, TEnv>
+    ): ComponentRenderer<TRef, TEnv> =>
     (fusion, env) =>
         lazy(async () => {
-            const init = configureModules<TModules, TRef, TManifest>(configure);
+            const init = configureModules<TModules, TRef, TEnv>(configure);
             const modules = (await init({
                 fusion,
-                manifest: env,
+                env,
             })) as unknown as AppModulesInstance;
 
             modules.event.dispatchEvent('onReactAppLoaded', {

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, { name: 'legacy' });
+            return creator(fusion, { manifest: { name: 'legacy' } });
         }, []);
         return (
             <Suspense fallback={<p>loading app</p>}>

package/src/index.ts

@@ -18,4 +18,6 @@ export { createComponent } from './create-component';
 export { renderComponent } from './render-component';
 export { createLegacyApp } from './create-legacy-app';
 
+export type { ComponentRenderArgs, ComponentRenderer } from './create-component';
+
 export { default } from './render-app';