@wavemaker/angular-codegen 10.16.2-next.1400317 → 10.16.2-next.1400321

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/main.ts

@@ -5,8 +5,6 @@ import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
 
 import initWmProjectProperties from './app/wm-project-properties';
-import { isIos, isSpotcues } from '@wm/core';
-import { initSpotCues } from '@wm/runtime/base';
 
 initWmProjectProperties();
 
@@ -16,9 +14,7 @@ if (environment.production) {
 
 document.addEventListener('DOMContentLoaded', () => {
     new Promise<Event | void>( resolve => {
-        if (isSpotcues) {
-            initSpotCues().then(resolve);
-        } else if (window['cordova']) {
+        if (window['cordova']) {
             document.addEventListener('deviceready', resolve);
         } else {
             resolve();

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/angular-app/tsconfig.json

@@ -37,6 +37,9 @@
             "@wm/core": [
                 "node_modules/@wavemaker/app-ng-runtime/core"
             ],
+            "@wavemaker/variables": [
+                "node_modules/@wavemaker/variables/"
+            ],
             "@wm/components/base": [
                 "node_modules/@wavemaker/app-ng-runtime/components/base"
             ],

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 + ' ./node_modules/@angular/cli/bin/ng build ' + ngBuildParams + ' && node build-scripts/post-build.js', null, MSG_NG_RUNTIME_LOG, false, NG_BUILD_MSG);
 }