Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions libs/mf-tools/src/lib/web-components/bootstrap-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ export type Options = {
* Default value true.
*/
activeLegacyMode?: boolean;
/**
* Use platformRef.instance.ngZone to run router events
* Default value false.
*/
useInstanceNgZone?: boolean;
};

declare interface BootstrapOptions {
Expand Down Expand Up @@ -193,7 +198,10 @@ export function bootstrap<M>(
if (options.appType === 'shell') {
shareShellZone(ref.injector);
} else if (options.appType === 'microfrontend') {
connectMicroFrontendRouter(ref.injector);
connectMicroFrontendRouter(
ref.injector,
options?.useInstanceNgZone ? ref.instance?.ngZone : undefined
);
}

return ref;
Expand All @@ -209,7 +217,7 @@ function shareShellZone(injector: Injector) {
shareNgZone(ngZone);
}

function connectMicroFrontendRouter(injector: Injector) {
function connectMicroFrontendRouter(injector: Injector, ngZone: NgZone = undefined) {
const router = injector.get(Router);
const useHash = location.href.includes('#');

Expand All @@ -218,5 +226,5 @@ function connectMicroFrontendRouter(injector: Injector) {
return;
}

connectRouter(router, useHash);
connectRouter(router, useHash, ngZone);
}
15 changes: 10 additions & 5 deletions libs/mf-tools/src/lib/web-components/router-utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Router, UrlMatcher, UrlSegment } from '@angular/router';
import { NgZone } from '@angular/core';

export function startsWith(prefix: string): UrlMatcher {
return (url: UrlSegment[]) => {
Expand All @@ -20,19 +21,23 @@ export function endsWith(prefix: string): UrlMatcher {
};
}

export function connectRouter(router: Router, useHash = false): void {
function navigateWithNgZone(router: Router, ngZone: NgZone, url: string) {
ngZone.run(() => router.navigateByUrl(url));
}

export function connectRouter(router: Router, useHash = false, ngZone = undefined): void {
let url: string;
if (!useHash) {
url = `${location.pathname.substring(1)}${location.search}`;
router.navigateByUrl(url);
!!ngZone ? navigateWithNgZone(router, ngZone, url) : router.navigateByUrl(url);
window.addEventListener('popstate', () => {
router.navigateByUrl(url);
!!ngZone ? navigateWithNgZone(router, ngZone, url) : router.navigateByUrl(url);
});
} else {
url = `${location.hash.substring(1)}${location.search}`;
router.navigateByUrl(url);
!!ngZone ? navigateWithNgZone(router, ngZone, url) : router.navigateByUrl(url);
window.addEventListener('hashchange', () => {
router.navigateByUrl(url);
!!ngZone ? navigateWithNgZone(router, ngZone, url) : router.navigateByUrl(url);
});
}
}
2 changes: 1 addition & 1 deletion libs/mf/src/builders/build/builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ export function runBuilder(
);
}

export default createBuilder(runBuilder);
export default createBuilder(runBuilder) as any;
1 change: 0 additions & 1 deletion libs/mf/src/schematics/mf/schematic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import {
getPackageJsonDependency,
NodeDependencyType,
} from '@schematics/angular/utility/dependencies';
import { serve } from 'esbuild';

export function add(options: MfSchematicSchema): Rule {
return config(options);
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.