update brunch

Author: yuvalotem1

package.json

@@ -21,7 +21,7 @@
     "@angular/platform-browser": "^12.0.0",
     "@angular/platform-browser-dynamic": "^12.0.0",
     "@angular/router": "^12.0.0",
-    "@frontegg/js": "6.126.0",
+    "@frontegg/js": "6.131.0",
     "csstype": "^3.0.8",
     "rxjs": "~6.6.0",
     "stream": "^0.0.2",
@@ -42,10 +42,10 @@
     "karma-coverage": "~2.0.3",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
-    "ng-packagr": "^11.0.0",
+    "ng-packagr": "^12.0.0",
     "protractor": "~7.0.0",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
     "typescript": "~4.2.3"
   }
-}
+}

projects/example/src/app/app.module.ts

@@ -18,12 +18,12 @@ import { CheckoutDialogModule } from './checkout-dialog/checkout-dialog.module';
     BrowserModule,
     AppRoutingModule,
     FronteggAppModule.forRoot(
+      // @ts-ignore
+      window.CYPRESS_CONFIG ||
       {
         contextOptions: {
-          // @ts-ignore
-          baseUrl: process.env.FRONTEGG_BASE_URL || 'https://demo.frontegg.com',
-          // @ts-ignore
-          clientId: process.env.FRONTEGG_CLIENT_ID || 'b6adfe4c-d695-4c04-b95f-3ec9fd0c6cca',
+          baseUrl: 'https://demo.frontegg.com',
+          clientId: 'b6adfe4c-d695-4c04-b95f-3ec9fd0c6cca',
         },
         authOptions: {
           keepSessionAlive: true,

projects/example/src/main.ts

@@ -3,6 +3,7 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
 import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
+import '@angular/compiler';
 
 if (environment.production) {
   enableProdMode();

projects/frontegg-app/package.json

@@ -7,10 +7,10 @@
     "@angular/core": ">=12.0.0"
   },
   "dependencies": {
-    "@frontegg/js": "6.126.0",
+    "@frontegg/js": "6.131.0",
     "csstype": "^3.0.8",
     "fast-deep-equal": "^3.1.3",
     "stream": "^0.0.2",
     "tslib": "^2.0.0"
   }
-}
+}

projects/frontegg-app/src/lib/frontegg-app.module.ts

@@ -2,9 +2,8 @@ import { ModuleWithProviders, NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
 import { FronteggAppOptions } from '@frontegg/types';
-import { FronteggAppOptionsClass, FronteggAppService } from './frontegg-app.service';
+import { FronteggAppOptionsClass, FronteggAppService, FronteggLoadGuard } from './frontegg-app.service';
 import { FronteggComponent } from './frontegg.component';
-import { FronteggLoadGuard } from './guards/frontegg-load.guard';
 import { FronteggAuthGuard } from './guards/frontegg-auth.guard';
 import { FronteggAuthService } from './frontegg-auth.service';
 import { AuthorizedContentDirective } from './directives/authorized-content.directive';

projects/frontegg-app/src/lib/frontegg-app.service/frontegg-app.service.ts

@@ -1,14 +1,14 @@
-import { Inject, Injectable, NgZone } from '@angular/core';
+import { Injectable, NgZone, Inject } from '@angular/core';
 import angularCoreVersion from '@angular/core/package.json';
-import { Route, Router } from '@angular/router';
+import { Route, Router, ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot } from '@angular/router';
 import { FronteggApp, initialize } from '@frontegg/js';
 import { AuthPageRoutes, FronteggState, isAuthRoute } from '@frontegg/redux-store';
 import { ContextHolder, FronteggFrameworks, RedirectOptions } from '@frontegg/rest-api';
 import { FronteggAppOptions, FronteggCheckoutDialogOptions } from '@frontegg/types';
 import sdkVersion from '../../sdkVersion';
 import { FronteggComponent } from '../frontegg.component';
-import { FronteggLoadGuard } from '../guards/frontegg-load.guard';
 import { FronteggAppSignals } from './frontegg-app.signals';
+import { Observable } from 'rxjs';
 
 export class FronteggAppOptionsClass implements FronteggAppOptions {
   contextOptions: FronteggAppOptions['contextOptions'] = {
@@ -136,3 +136,19 @@ export class FronteggAppService extends FronteggAppSignals {
     this.fronteggApp?.hideCheckoutDialog();
   }
 }
+
+@Injectable()
+export class FronteggLoadGuard implements CanActivate {
+  constructor(protected fronteggAppService: FronteggAppService) {
+  }
+
+  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | Promise<boolean> | boolean {
+    return new Observable<boolean>(obs => {
+      this.fronteggAppService.isLoading$.subscribe(loading => {
+        if (!loading) {
+          obs.next(true);
+        }
+      });
+    });
+  }
+}

projects/frontegg-app/src/lib/guards/frontegg-load.guard.ts

@@ -10,5 +10,4 @@ export { FronteggEntitlementsService } from './lib/frontegg-entitlements.service
 export { FronteggSubscriptionService } from './lib/frontegg-subscription.services';
 export * from './lib/directives/authorized-content.directive';
 export * from './lib/guards/frontegg-auth.guard';
-export * from './lib/guards/frontegg-load.guard';
 export { ContextHolder } from '@frontegg/rest-api';

projects/frontegg-app/src/public-api.ts

@@ -17,7 +17,8 @@
   "angularCompilerOptions": {
     "skipTemplateCodegen": true,
     "strictMetadataEmit": true,
-    "enableResourceInlining": true
+    "enableResourceInlining": true,
+    "compilationMode": "partial"
   },
   "exclude": [
     "src/test.ts",

projects/frontegg-app/tsconfig.lib.json

@@ -3,5 +3,8 @@
   "extends": "./tsconfig.lib.json",
   "compilerOptions": {
     "declarationMap": false
+  },
+  "angularCompilerOptions": {
+    "compilationMode": "partial"
   }
 }