@wavemaker/angular-codegen 11.0.2-rc.5180 → 11.0.2-rc.5185

angular-codegen/angular-app/src/environments/environment.ts

@@ -13,4 +13,4 @@ export const environment = {
  * This import should be commented out in production mode because it will have a negative impact
  * on performance if an error is thrown.
  */
-// import 'zone.js/dist/zone-error';  // Included with Angular CLI.
+// import 'zone.js/plugins/zone-error';  // Included with Angular CLI.

angular-codegen/angular-app/src/polyfills.ts

@@ -61,7 +61,7 @@ import 'core-js/es6/reflect';
 /***************************************************************************************************
  * Zone JS is required by default for Angular itself.
  */
-import 'zone.js/dist/zone';  // Included with Angular CLI.
+import 'zone.js';  // Included with Angular CLI.
 
 
 /***************************************************************************************************

angular-codegen/build-angular-app.js

@@ -20,10 +20,13 @@ const { executeSyncCmd,  MSG_NG_RUNTIME_LOG, MSG_NG_RUNTIME_SUCCESS } = require(
 /**
  * @TODO: This is a temporary workaround to extract deploy-url from 'ngBuildParams', need to be replaced in future.
  */
-const getDeployUrl = (ngBuildParams) => {
+const updateDeployUrl = (ngBuildParams) => {
     let buildArgs = ngBuildParams.split(' ');
     const deployParam = buildArgs.find(i => i.startsWith("--deploy-url="));
-    return deployParam ? deployParam.split("=")[1] : 'ng-bundle/';
+    if(!deployParam) {
+        buildArgs.push("--deploy-url=ng-bundle/");
+    }
+    return ngBuildParams = buildArgs.join(" ");
 };
 
 /**
@@ -56,10 +59,10 @@ const buildAngularApp = (args) => {
         process.exit(err.code || err.pid);
     }
 
-    const deployUrl = getDeployUrl(args.ngBuildParams);
+    let ngBuildParams = updateDeployUrl(args.ngBuildParams);
     const NG_BUILD_MSG = 'NG BUILD MIGHT HAVE FAILED WITH HEAP OUT OF MEMORY, RE-EXECUTE THE BUILD BY INCREASING THE MAX-OLD-SPACE-SIZE ARGUMENT VALUE FOR BUILD.UI.NODE.ARGS PROPERTY IN DEPLOYMENT PROFILE';
     // Generating the angular build and post build process.
-    executeSyncCmd('cd ' + args.appTarget + ' && node ' + args.nodeVMArgs + ' ' + './node_modules/@angular/cli/bin/ng build ' + args.ngBuildParams + ' && node build-scripts/post-build.js --deploy-url=' + deployUrl, null, MSG_NG_RUNTIME_LOG, false, NG_BUILD_MSG);
+    executeSyncCmd('cd ' + args.appTarget + ' && node ' + args.nodeVMArgs + ' `which npm`' + ' run build -- ' + ngBuildParams, null, MSG_NG_RUNTIME_LOG, false, NG_BUILD_MSG);
 }
 
 

angular-codegen/dependencies/app.component.html

@@ -0,0 +1,22 @@
+<ng-container *ngIf="startApp">
+    <router-outlet></router-outlet>
+    <div wmContainer partialContainer content="Common" hidden class="ng-hide" *ngIf="isApplicationType"></div>
+    <app-spinner name="globalspinner" classname="global-spinner" role="alert" aria-live="assertive" [attr.aria-label]="spinner.arialabel || 'Loading'" [show]="spinner.show" [spinnermessages]="spinner.messages"></app-spinner>
+    <div wmDialog name="oAuthLoginDialog" title="Application is requesting you to sign in with"
+         close.event="closeOAuthDialog()">
+        <ng-template #dialogBody>
+            <ul class="list-items">
+                <li class="list-item" *ngFor="let provider of providersConfig">
+                    <button class="btn" (click)="provider.invoke()">{{provider.name}}</button>
+                </li>
+            </ul>
+        </ng-template>
+    </div>
+    <div wmConfirmDialog name="_app-confirm-dialog" title.bind="title" message.bind="message" oktext.bind="oktext"
+         canceltext.bind="canceltext" closable="false" iconclass.bind="iconclass"
+         escape.event="onEscape()" ok.event="onOk()" cancel.event="onCancel()" close.event="onClose()" opened.event="onOpen()"></div>
+    <div wmAppExt></div>
+    <i id="wm-mobile-display"></i>
+</ng-container>
+<!--Dummy container to create the component dynamically-->
+<ng-container #dynamicComponent></ng-container>