Merge branch 'main' of https://github.com/angular-architects/module-f…

…ederation-plugin into main
angular-architects · Feb 13, 2022 · f4b5dc2 · f4b5dc2
2 parents 4eb53ff + 5ba3753
commit f4b5dc2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/libs/mf-tools/src/lib/web-components/router-utils.ts b/libs/mf-tools/src/lib/web-components/router-utils.ts
@@ -20,17 +20,20 @@ export function endsWith(prefix: string): UrlMatcher {
     };
 }
 
-export function connectRouter(router: Router, useHash = false) {
+export function connectRouter(router: Router, useHash = false): void {
+    let url: string;
     if (!useHash) {
-        router.navigateByUrl(location.pathname.substr(1));
+        url = `${location.pathname.substr(1)}${location.search}`;
+        router.navigateByUrl(url);
         window.addEventListener('popstate', () => {
-            router.navigateByUrl(location.pathname.substr(1));
+            router.navigateByUrl(url);
         });
     }
     else {
-        router.navigateByUrl(location.hash.substr(1));
+        url = `${location.hash.substr(1)}${location.search}`;
+        router.navigateByUrl(url);
         window.addEventListener('hashchange', () => {
-            router.navigateByUrl(location.hash.substr(1));
+            router.navigateByUrl(url);
         });
     }
 }
diff --git a/libs/mf/README.md b/libs/mf/README.md
@@ -271,7 +271,7 @@ shared: share({
         strictVersion: true,
         requiredVersion: 'auto',
         includeSecondaries: {
-            skip: ['@angular/http/testing']
+            skip: ['@angular/common/http/testing']
         }
     },
     [...]

diff --git a/libs/mf/src/utils/share-utils.ts b/libs/mf/src/utils/share-utils.ts
@@ -112,7 +112,7 @@ function addSecondaries(secondaries: string[], result: Config, shareObject: Conf
     }
 }
 
-export function shareAll(config: Config = {}, skip: string[] = [], packageJsonPath = ''): void {
+export function shareAll(config: Config = {}, skip: string[] = [], packageJsonPath = ''): Config {
 
     if (!packageJsonPath) {
         const stack = callsite();