feat: pass origin to component

TouK · Nov 19, 2024 · 88af7d1 · 88af7d1
1 parent 555830f
commit 88af7d1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/FederatedComponent.tsx b/src/FederatedComponent.tsx
@@ -34,16 +34,16 @@ function FederatedComponentRender<P extends NonNullable<unknown>, T>(
     }: FederatedComponentProps<P> & Pick<FederatedModuleProviderProps, "fallback" | "buildHash">,
     ref: React.ForwardedRef<T>,
 ) {
-    const [, scopeValue, , , , query] = splitUrl(url as ModuleUrl);
+    const [, scopeValue, , , , , u] = useMemo(() => splitUrl(url as ModuleUrl), [url]);
 
     const params = useMemo(() => {
-        const searchParams = new URLSearchParams(query);
+        const searchParams = u.searchParams;
         return Object.fromEntries(searchParams.entries()) as P;
-    }, [query]);
+    }, [u]);
 
     return (
         <FederatedModuleProvider url={url} fallback={fallback} buildHash={buildHash}>
-            <Component ref={ref} {...params} {...props} scope={scope || scopeValue} />
+            <Component ref={ref} {...params} {...props} scope={scope || scopeValue} moduleOrigin={u.origin} />
         </FederatedModuleProvider>
     );
 }

diff --git a/src/tools/splitUrl.tsx b/src/tools/splitUrl.tsx
@@ -4,7 +4,7 @@ import { ModuleString, ModuleUrl, PathString, QueryString, ScopeString, ScriptUr
  * Split FederatedModule url to url and module parts.
  * @param fullModuleUrl
  */
-export function splitUrl(fullModuleUrl: ModuleUrl): [ModuleUrl, ModuleString, ScriptUrl, ScopeString, PathString, QueryString] {
+export function splitUrl(fullModuleUrl: ModuleUrl): [ModuleUrl, ModuleString, ScriptUrl, ScopeString, PathString, QueryString, URL] {
     const [module, url] = fullModuleUrl.split("@");
     const [scope] = module.split("/");
     const path = module.replace(scope, ".");
@@ -14,5 +14,13 @@ export function splitUrl(fullModuleUrl: ModuleUrl): [ModuleUrl, ModuleString, Sc
         throw new Error("invalid remote module url");
     }
 
-    return [fullModuleUrl, module as ModuleString, script as ScriptUrl, scope as ScopeString, path as PathString, query as QueryString];
+    return [
+        fullModuleUrl,
+        module as ModuleString,
+        script as ScriptUrl,
+        scope as ScopeString,
+        path as PathString,
+        query as QueryString,
+        new URL(script, window.location.origin),
+    ];
 }