@wavemaker/angular-codegen 11.7.0-next.24863 → 11.7.0-next.26328

angular-codegen/angular-app/build-scripts/build.js

@@ -1,18 +1,23 @@
 const { spawnSync } = require('child_process');
 const path = require('path');
 
-const args = process.argv.slice(2);
-
+let processArgs = process.argv;
+if (processArgs.findIndex(arg => arg.startsWith('--max-old-space-size')) !== -1) {
+    process.env.NODE_OPTIONS = processArgs.pop();
+}
+const args = processArgs.slice(2);
 const ngBuildArgs = ['build', ...args];
 console.log("Build params - ", ngBuildArgs);
+console.log("Setting node options - ", process.env.NODE_OPTIONS);
 
 //Trigger angular build with the passed params
 const ngPath = path.resolve(process.cwd(), 'node_modules', '.bin', "ng");
-const ngBuildProcess = spawnSync(ngPath, ngBuildArgs, { stdio: 'inherit', shell: true });
+const ngBuildProcess = spawnSync(ngPath, ngBuildArgs, {stdio: 'inherit', shell: true});
 
 if (ngBuildProcess.status === 0) {
     console.log('ng build completed successfully!');
 } else {
+    // TODO: JS heap out of memory error handling
     console.error('Error during ng build:', ngBuildProcess.error || ngBuildProcess.stderr);
     process.exit(1);
 }

angular-codegen/angular-app/package-lock.json

@@ -35,8 +35,8 @@
                 "@babel/runtime": "^7.14.8",
                 "@metrichor/jmespath": "^0.3.1",
                 "@wavemaker/focus-trap": "^1.0.0",
-                "@wavemaker/nvd3": "1.8.9",
-                "@wavemaker/variables": "11.7.0-next.24863",
+                "@wavemaker/nvd3": "1.8.10",
+                "@wavemaker/variables": "11.7.0-next.26328",
                 "@ztree/ztree_v3": "^3.5.48",
                 "angular-imask": "7.4.0",
                 "angular2-websocket": "0.9.7",
@@ -5681,17 +5681,17 @@
             }
         },
         "node_modules/@wavemaker/nvd3": {
-            "version": "1.8.9",
-            "resolved": "https://registry.npmjs.org/@wavemaker/nvd3/-/nvd3-1.8.9.tgz",
-            "integrity": "sha512-J3uleu0akL+Kvw5j9EcP6JRRtkqHl3p1CBqKywiOYeR86+dao415i3V3xMbI8wHKAjIgf54mqIb9qR7M+74xjw==",
+            "version": "1.8.10",
+            "resolved": "https://registry.npmjs.org/@wavemaker/nvd3/-/nvd3-1.8.10.tgz",
+            "integrity": "sha512-wZ7cXSNnTfL97afyKFYTOVu5xNUlrBPYtj89rTM5eSU9xSAxP6W0Z0zPWr233OfvfcmCt02E/OBgAg56lp4Bew==",
             "peerDependencies": {
                 "d3": "7.8.5"
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "11.7.0-next.24863",
-            "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-11.7.0-next.24863.tgz",
-            "integrity": "sha512-HPHKzUaWFCIzTD0NTdzlMjIGdTJM06xxhdgdv+f4gLKZU1v8EadEx/DxRiuYGi1Lp4igAK+gAwaOu07sNU8YEA==",
+            "version": "11.7.0-next.26328",
+            "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-11.7.0-next.26328.tgz",
+            "integrity": "sha512-93ZsZ4zCWgI7F0no8bQOVehIF9PyKfUpg552BT0MzBXm+7rlMu0PgObWuo2SkHMw1NADW5nQ73/BhnCs6Sij+g==",
             "dependencies": {
                 "@metrichor/jmespath": "^0.3.1",
                 "he": "^1.2.0",

angular-codegen/angular-app/package.json

@@ -46,8 +46,8 @@
         "@babel/runtime": "^7.14.8",
         "@metrichor/jmespath": "^0.3.1",
         "@wavemaker/focus-trap": "^1.0.0",
-        "@wavemaker/nvd3": "1.8.9",
-        "@wavemaker/variables": "11.7.0-next.24863",
+        "@wavemaker/nvd3": "1.8.10",
+        "@wavemaker/variables": "11.7.0-next.26328",
         "@ztree/ztree_v3": "^3.5.48",
         "angular-imask": "7.4.0",
         "angular2-websocket": "0.9.7",
@@ -72,7 +72,7 @@
         "tslib": "2.4.1",
         "x2js": "^3.4.4",
         "zone.js": "~0.13.3",
-        "@wavemaker/app-ng-runtime": "11.7.0-next.24863"
+        "@wavemaker/app-ng-runtime": "11.7.0-next.26328"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "^0.27.0",

angular-codegen/build-angular-app.js

@@ -20,12 +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 updateDeployUrl = (ngBuildParams) => {
-    let buildArgs = ngBuildParams.split(' ');
+const updateDeployUrl = (args) => {
+    let buildArgs = args.ngBuildParams.split(' ');
     const deployParam = buildArgs.find(i => i.startsWith("--deploy-url="));
     if(!deployParam) {
         buildArgs.push("--deploy-url=ng-bundle/");
     }
+    buildArgs.push(args.nodeVMArgs);
     return ngBuildParams = buildArgs.join(" ");
 };
 
@@ -59,10 +60,10 @@ const buildAngularApp = (args) => {
         process.exit(err.code || err.pid);
     }
 
-    let ngBuildParams = updateDeployUrl(args.ngBuildParams);
+    let ngBuildParams = updateDeployUrl(args);
     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.trim() + ' ./build-scripts/build.js ' + ngBuildParams , null, MSG_NG_RUNTIME_LOG, false, NG_BUILD_MSG);
+    executeSyncCmd('cd ' + args.appTarget + ' && node ./build-scripts/build.js ' + ngBuildParams, null, MSG_NG_RUNTIME_LOG, false, NG_BUILD_MSG);
 }
 
 

angular-codegen/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.7.0-next.24863",
+    "version": "11.7.0-next.26328",
     "description": "",
     "main": "index.js",
     "scripts": {