npm - @wavemaker/angular-codegen - Versions diffs - 11.11.0-rc.6112 → 11.11.0-rc.6115 - Mend

@wavemaker/angular-codegen 11.11.0-rc.6112 → 11.11.0-rc.6115

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/angular-app/dependency-report.html +1 -1
package/angular-app/npm-shrinkwrap.json +23 -23
package/angular-app/package-lock.json +23 -23
package/angular-app/package.json +5 -5
package/build-angular-app.js +7 -11
package/download-packages.js +31 -99
package/npm-shrinkwrap.json +21 -21
package/package-lock.json +21 -21
package/package.json +2 -2
package/templates/app.config.ts.hbs +5 -5

package/angular-app/dependency-report.html CHANGED Viewed

@@ -69,7 +69,7 @@
 <body>
     <div class="header">
         <h1>Angular Project Dependencies Report</h1>
-        <p class="timestamp">Generated on: 4/16/2025, 12:14:58 PM</p>
+        <p class="timestamp">Generated on: 4/18/2025, 10:21:15 PM</p>
     </div>
     <div class="section">

package/angular-app/npm-shrinkwrap.json CHANGED Viewed

@@ -1,12 +1,12 @@
 {
     "name": "@wavemaker/angular-app",
-    "version": "11.11.0-rc.6112",
+    "version": "11.11.0-rc.6115",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@wavemaker/angular-app",
-            "version": "11.11.0-rc.6112",
+            "version": "11.11.0-rc.6115",
             "dependencies": {
                 "@angular/animations": "18.2.13",
                 "@angular/common": "18.2.13",
@@ -24,12 +24,12 @@
                 "@fullcalendar/list": "6.1.15",
                 "@fullcalendar/timegrid": "6.1.15",
                 "@metrichor/jmespath": "0.3.1",
-                "@wavemaker/app-ng-runtime": "11.11.0-rc.6112",
-                "@wavemaker/custom-widgets-m3": "11.11.0-rc.6112",
+                "@wavemaker/app-ng-runtime": "11.11.0-rc.6115",
+                "@wavemaker/custom-widgets-m3": "11.11.0-rc.6115",
                 "@wavemaker/focus-trap": "1.0.1",
-                "@wavemaker/foundation-css": "11.11.0-rc.6112",
+                "@wavemaker/foundation-css": "11.11.0-rc.6115",
                 "@wavemaker/nvd3": "1.8.12",
-                "@wavemaker/variables": "11.11.0-rc.6112",
+                "@wavemaker/variables": "11.11.0-rc.6115",
                 "@ztree/ztree_v3": "3.5.48",
                 "angular-imask": "^7.6.1",
                 "angular2-websocket": "0.9.7",
@@ -4487,8 +4487,8 @@
             }
         },
         "node_modules/@eslint-community/eslint-utils": {
-            "version": "4.6.0",
-            "integrity": "sha512-WhCn7Z7TauhBtmzhvKpoQs0Wwb/kBcy4CwpuI0/eEIr2Lx2auxmulAzLr91wVZJaz47iUZdkXOK7WlAfxGKCnA==",
+            "version": "4.6.1",
+            "integrity": "sha512-KTsJMmobmbrFLe3LDh0PC2FXpcSYJt/MLjlkh/9LEnmKYLSYmT/0EW9JWANjeoemiuZrmogti0tW5Ch+qNUYDw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -7999,8 +7999,8 @@
             }
         },
         "node_modules/@wavemaker/app-ng-runtime": {
-            "version": "11.11.0-rc.6112",
-            "integrity": "sha512-ATDN1BwkK7gOWoTArI7DLhj+3txztxCMbum4c40TnmG/DN9+W+id+fKyJgaJ8hLvjjtyKhlfsejxsLMpBlFbWQ==",
+            "version": "11.11.0-rc.6115",
+            "integrity": "sha512-mFxYU6T0ZRkYMQglmjaPm7OEx/wdwUvwoCiozSzUhkc/UC6fxFdSmMnSlgdXquvPRaLhXjYlPrG1HWGPln1WFQ==",
             "license": "MIT",
             "engines": {
                 "node": ">=18.16.1",
@@ -8008,8 +8008,8 @@
             }
         },
         "node_modules/@wavemaker/custom-widgets-m3": {
-            "version": "11.11.0-rc.6112",
-            "integrity": "sha512-CIS1Yw9qNByO545btY0WmnNtKG0+FKTrcxiI4cmOnLg6H60DSxv9QbffdX8t8HzZcytp1nBhSdhaK6+OdCZb/g==",
+            "version": "11.11.0-rc.6115",
+            "integrity": "sha512-/0vxCAQ7tzRcWv5VMbu4LYZwXeqhvOkUindCPCIqeidK/LgOj3gY/njMDxG+PMkuCMsHuj19dBQPgs2d0nFDOQ==",
             "license": "ISC"
         },
         "node_modules/@wavemaker/focus-trap": {
@@ -8022,8 +8022,8 @@
             }
         },
         "node_modules/@wavemaker/foundation-css": {
-            "version": "11.11.0-rc.6112",
-            "integrity": "sha512-2LRrrTbsH9GKiYWnO4OIgNMpuQ2bv1p2qXYPqNj2JgLxkJrpNew0QxqilIv8jGe20vtxIhfP9rfVMG/DqS8N4A==",
+            "version": "11.11.0-rc.6115",
+            "integrity": "sha512-91kmhXk2F/BRhQVhA1yk6AKwUjbU2fuYKQnYaOuOzzFQ3RFrgRAPysxPoqQ+SnSCfwphVJ8oLW5uS2ff/w0UUQ==",
             "license": "ISC",
             "dependencies": {
                 "chroma-js": "^3.1.2"
@@ -8038,8 +8038,8 @@
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "11.11.0-rc.6112",
-            "integrity": "sha512-yXg/R1dLdwY/tVkFXFeJsfR5IVjEcbBgYi2tFeKUZMZrTm3W/+qeQbJ/RsxP6Afuc8xCXCyhEu3k4j8WwTO53Q==",
+            "version": "11.11.0-rc.6115",
+            "integrity": "sha512-xLKKtCMpOY3JCmT4KRWUSyxvouN2KGkMNmNENnJHAjfimOfmMb8KhUPryL0noTPr47eRcCMZryxH+++654jnYw==",
             "license": "ISC",
             "dependencies": {
                 "@metrichor/jmespath": "^0.3.1",
@@ -8378,12 +8378,12 @@
             "license": "MIT"
         },
         "node_modules/acorn-loose": {
-            "version": "8.4.0",
-            "integrity": "sha512-M0EUka6rb+QC4l9Z3T0nJEzNOO7JcoJlYMrBlyBCiFSXRyxjLKayd4TbQs2FDRWQU1h9FR7QVNHt+PEaoNL5rQ==",
+            "version": "8.5.0",
+            "integrity": "sha512-ppga7pybjwX2HSJv5ayHe6QG4wmNS1RQ2wjBMFTVnOj0h8Rxsmtc6fnVzINqHSSRz23sTe9IL3UAt/PU9gc4FA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "acorn": "^8.11.0"
+                "acorn": "^8.14.0"
             },
             "engines": {
                 "node": ">=0.4.0"
@@ -9553,8 +9553,8 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001713",
-            "integrity": "sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==",
+            "version": "1.0.30001714",
+            "integrity": "sha512-mtgapdwDLSSBnCI3JokHM7oEQBLxiJKVRtg10AxM1AyeiKcM96f0Mkbqeq+1AbiCtvMcHRulAAEMu693JrSWqg==",
             "dev": true,
             "funding": [
                 {
@@ -11635,8 +11635,8 @@
             }
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.137",
-            "integrity": "sha512-/QSJaU2JyIuTbbABAo/crOs+SuAZLS+fVVS10PVrIT9hrRkmZl8Hb0xPSkKRUUWHQtYzXHpQUW3Dy5hwMzGZkA==",
+            "version": "1.5.138",
+            "integrity": "sha512-FWlQc52z1dXqm+9cCJ2uyFgJkESd+16j6dBEjsgDNuHjBpuIzL8/lRc0uvh1k8RNI6waGo6tcy2DvwkTBJOLDg==",
             "dev": true,
             "license": "ISC"
         },

package/angular-app/package-lock.json CHANGED Viewed

@@ -1,12 +1,12 @@
 {
     "name": "@wavemaker/angular-app",
-    "version": "11.11.0-rc.6112",
+    "version": "11.11.0-rc.6115",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@wavemaker/angular-app",
-            "version": "11.11.0-rc.6112",
+            "version": "11.11.0-rc.6115",
             "dependencies": {
                 "@angular/animations": "18.2.13",
                 "@angular/common": "18.2.13",
@@ -24,12 +24,12 @@
                 "@fullcalendar/list": "6.1.15",
                 "@fullcalendar/timegrid": "6.1.15",
                 "@metrichor/jmespath": "0.3.1",
-                "@wavemaker/app-ng-runtime": "11.11.0-rc.6112",
-                "@wavemaker/custom-widgets-m3": "11.11.0-rc.6112",
+                "@wavemaker/app-ng-runtime": "11.11.0-rc.6115",
+                "@wavemaker/custom-widgets-m3": "11.11.0-rc.6115",
                 "@wavemaker/focus-trap": "1.0.1",
-                "@wavemaker/foundation-css": "11.11.0-rc.6112",
+                "@wavemaker/foundation-css": "11.11.0-rc.6115",
                 "@wavemaker/nvd3": "1.8.12",
-                "@wavemaker/variables": "11.11.0-rc.6112",
+                "@wavemaker/variables": "11.11.0-rc.6115",
                 "@ztree/ztree_v3": "3.5.48",
                 "angular-imask": "^7.6.1",
                 "angular2-websocket": "0.9.7",
@@ -4487,8 +4487,8 @@
             }
         },
         "node_modules/@eslint-community/eslint-utils": {
-            "version": "4.6.0",
-            "integrity": "sha512-WhCn7Z7TauhBtmzhvKpoQs0Wwb/kBcy4CwpuI0/eEIr2Lx2auxmulAzLr91wVZJaz47iUZdkXOK7WlAfxGKCnA==",
+            "version": "4.6.1",
+            "integrity": "sha512-KTsJMmobmbrFLe3LDh0PC2FXpcSYJt/MLjlkh/9LEnmKYLSYmT/0EW9JWANjeoemiuZrmogti0tW5Ch+qNUYDw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -7999,8 +7999,8 @@
             }
         },
         "node_modules/@wavemaker/app-ng-runtime": {
-            "version": "11.11.0-rc.6112",
-            "integrity": "sha512-ATDN1BwkK7gOWoTArI7DLhj+3txztxCMbum4c40TnmG/DN9+W+id+fKyJgaJ8hLvjjtyKhlfsejxsLMpBlFbWQ==",
+            "version": "11.11.0-rc.6115",
+            "integrity": "sha512-mFxYU6T0ZRkYMQglmjaPm7OEx/wdwUvwoCiozSzUhkc/UC6fxFdSmMnSlgdXquvPRaLhXjYlPrG1HWGPln1WFQ==",
             "license": "MIT",
             "engines": {
                 "node": ">=18.16.1",
@@ -8008,8 +8008,8 @@
             }
         },
         "node_modules/@wavemaker/custom-widgets-m3": {
-            "version": "11.11.0-rc.6112",
-            "integrity": "sha512-CIS1Yw9qNByO545btY0WmnNtKG0+FKTrcxiI4cmOnLg6H60DSxv9QbffdX8t8HzZcytp1nBhSdhaK6+OdCZb/g==",
+            "version": "11.11.0-rc.6115",
+            "integrity": "sha512-/0vxCAQ7tzRcWv5VMbu4LYZwXeqhvOkUindCPCIqeidK/LgOj3gY/njMDxG+PMkuCMsHuj19dBQPgs2d0nFDOQ==",
             "license": "ISC"
         },
         "node_modules/@wavemaker/focus-trap": {
@@ -8022,8 +8022,8 @@
             }
         },
         "node_modules/@wavemaker/foundation-css": {
-            "version": "11.11.0-rc.6112",
-            "integrity": "sha512-2LRrrTbsH9GKiYWnO4OIgNMpuQ2bv1p2qXYPqNj2JgLxkJrpNew0QxqilIv8jGe20vtxIhfP9rfVMG/DqS8N4A==",
+            "version": "11.11.0-rc.6115",
+            "integrity": "sha512-91kmhXk2F/BRhQVhA1yk6AKwUjbU2fuYKQnYaOuOzzFQ3RFrgRAPysxPoqQ+SnSCfwphVJ8oLW5uS2ff/w0UUQ==",
             "license": "ISC",
             "dependencies": {
                 "chroma-js": "^3.1.2"
@@ -8038,8 +8038,8 @@
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "11.11.0-rc.6112",
-            "integrity": "sha512-yXg/R1dLdwY/tVkFXFeJsfR5IVjEcbBgYi2tFeKUZMZrTm3W/+qeQbJ/RsxP6Afuc8xCXCyhEu3k4j8WwTO53Q==",
+            "version": "11.11.0-rc.6115",
+            "integrity": "sha512-xLKKtCMpOY3JCmT4KRWUSyxvouN2KGkMNmNENnJHAjfimOfmMb8KhUPryL0noTPr47eRcCMZryxH+++654jnYw==",
             "license": "ISC",
             "dependencies": {
                 "@metrichor/jmespath": "^0.3.1",
@@ -8378,12 +8378,12 @@
             "license": "MIT"
         },
         "node_modules/acorn-loose": {
-            "version": "8.4.0",
-            "integrity": "sha512-M0EUka6rb+QC4l9Z3T0nJEzNOO7JcoJlYMrBlyBCiFSXRyxjLKayd4TbQs2FDRWQU1h9FR7QVNHt+PEaoNL5rQ==",
+            "version": "8.5.0",
+            "integrity": "sha512-ppga7pybjwX2HSJv5ayHe6QG4wmNS1RQ2wjBMFTVnOj0h8Rxsmtc6fnVzINqHSSRz23sTe9IL3UAt/PU9gc4FA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "acorn": "^8.11.0"
+                "acorn": "^8.14.0"
             },
             "engines": {
                 "node": ">=0.4.0"
@@ -9553,8 +9553,8 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001713",
-            "integrity": "sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==",
+            "version": "1.0.30001714",
+            "integrity": "sha512-mtgapdwDLSSBnCI3JokHM7oEQBLxiJKVRtg10AxM1AyeiKcM96f0Mkbqeq+1AbiCtvMcHRulAAEMu693JrSWqg==",
             "dev": true,
             "funding": [
                 {
@@ -11635,8 +11635,8 @@
             }
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.137",
-            "integrity": "sha512-/QSJaU2JyIuTbbABAo/crOs+SuAZLS+fVVS10PVrIT9hrRkmZl8Hb0xPSkKRUUWHQtYzXHpQUW3Dy5hwMzGZkA==",
+            "version": "1.5.138",
+            "integrity": "sha512-FWlQc52z1dXqm+9cCJ2uyFgJkESd+16j6dBEjsgDNuHjBpuIzL8/lRc0uvh1k8RNI6waGo6tcy2DvwkTBJOLDg==",
             "dev": true,
             "license": "ISC"
         },

package/angular-app/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-app",
-    "version": "11.11.0-rc.6112",
+    "version": "11.11.0-rc.6115",
     "scripts": {
         "ng": "ng",
         "start": "./node_modules/.bin/ng serve",
@@ -37,11 +37,11 @@
         "@fullcalendar/list": "6.1.15",
         "@fullcalendar/timegrid": "6.1.15",
         "@metrichor/jmespath": "0.3.1",
-        "@wavemaker/custom-widgets-m3": "11.11.0-rc.6112",
+        "@wavemaker/custom-widgets-m3": "11.11.0-rc.6115",
         "@wavemaker/focus-trap": "1.0.1",
-        "@wavemaker/foundation-css": "11.11.0-rc.6112",
+        "@wavemaker/foundation-css": "11.11.0-rc.6115",
         "@wavemaker/nvd3": "1.8.12",
-        "@wavemaker/variables": "11.11.0-rc.6112",
+        "@wavemaker/variables": "11.11.0-rc.6115",
         "@ztree/ztree_v3": "3.5.48",
         "angular-imask": "^7.6.1",
         "angular2-websocket": "0.9.7",
@@ -67,7 +67,7 @@
         "tslib": "2.4.1",
         "x2js": "3.4.4",
         "zone.js": "0.14.10",
-        "@wavemaker/app-ng-runtime": "11.11.0-rc.6112"
+        "@wavemaker/app-ng-runtime": "11.11.0-rc.6115"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "^0.27.0",

package/build-angular-app.js CHANGED Viewed

@@ -148,11 +148,10 @@ const buildAngularApp = async (args) => {
             if (!fs.existsSync(SUCCESS_FILE)) {
                 // Check if another process is already installing
                 if (fs.existsSync(LOCK_FILE)) {
-                    console.log(`Waiting for another build to complete npm install... for package ${PACKAGE_NAME}`);
+                    console.log('Waiting for another build to complete npm install...');
                     await waitForLock(LOCK_FILE, 20 * 60 * 1000); // Wait for 20 minutes (timeout in milliseconds)
                 } else {
                     // Acquire the lock
-                    fs.mkdirSync(TARBALL_DOWNLOAD_PATH, { recursive: true });
                     fs.writeFileSync(LOCK_FILE, "PROGRESS");
                     await processAngularAppPackage(TARBALL_DOWNLOAD_PATH, TARBALL_DOWNLOAD_PATH, PACKAGE_NAME, true);
                     fs.writeFileSync(SUCCESS_FILE, "SUCCESS");
@@ -167,13 +166,11 @@ const buildAngularApp = async (args) => {
         }
     } catch (err) {
         deleteFiles([SUCCESS_FILE, LOCK_FILE])
-        console.log(MSG_NG_RUNTIME_LOG + `Something went wrong - for package ${PACKAGE_NAME}`, err);
+        console.log(MSG_NG_RUNTIME_LOG + 'Something went wrong - ', err);
         process.exit(err.code || err.pid);
     } finally {
         //cleanup : in windows / optimizeUIBuild is false, we need to delete the temp downloaded package
-        if (args.optimizeUIBuild) {
-            deleteFiles([path.join(TARBALL_DOWNLOAD_PATH, 'package'), path.join(TARBALL_DOWNLOAD_PATH, ANGULAR_APP_TARBALL_NAME), LOCK_FILE])
-        }
+        deleteFiles([path.join(TARBALL_DOWNLOAD_PATH, 'package'), path.join(TARBALL_DOWNLOAD_PATH, ANGULAR_APP_TARBALL_NAME), LOCK_FILE])
     }
     let ngBuildParams = updateDeployUrl(args);
@@ -311,10 +308,9 @@ const copyRecursiveSync = (src, dest) => {
  *  Install the app-runtime-wm-build if package not yet installed.
  *  Based on the platform type copy the bundle script into '/src/main/webapp'
  * @param {*} sourceDir
- * @param {*} baseDir
  * @returns
  */
-const buildAppInWMMode = async (sourceDir, baseDir) => {
+const buildAppInWMMode = (sourceDir, baseDir) => {
     /**
      * Download app-runtime-wm-build package and install if it doesn't exist
@@ -329,7 +325,7 @@ const buildAppInWMMode = async (sourceDir, baseDir) => {
     };
     appRuntimeWMBuildPackageInfo.baseDir = baseDir;
-    const PATH_WAVEMAKER_APP_RUNTIME_WM_BUILD = await downloadNPMPackage(appRuntimeWMBuildPackageInfo);
+    const PATH_WAVEMAKER_APP_RUNTIME_WM_BUILD = downloadNPMPackage(appRuntimeWMBuildPackageInfo);
     const FILE_PATH_WAVEMAKER_APP_RUNTIME_WM_BUILD = PATH_WAVEMAKER_APP_RUNTIME_WM_BUILD + '/node_modules/' + appRuntimeWMBuildPackageInfo.scope + '/' + appRuntimeWMBuildPackageInfo.name + '/';
@@ -460,7 +456,7 @@ const initBuild = async (buildConfigObj) => {
     const sourceDir = buildConfigObj.appSrc;
     let appTarget = buildConfigObj.appTarget;
-    let baseDir = buildConfigObj.optimizeUIBuild ? undefined : appTarget.split('/').slice(0, -2).join('/') + '/';
+    let baseDir = buildConfigObj.optimizeUIBuild ? undefined : appTarget.split('/').slice(0, 2).join('/') + '/';
     if (buildConfigObj.generateOverrideCSS) {
         const { generateOverrideCSS } = require(CODEGEN_INSTALLATION + 'src/gen-app-override-css.js');
         await generateOverrideCSS(buildConfigObj, sourceDir, baseDir);
@@ -473,7 +469,7 @@ const initBuild = async (buildConfigObj) => {
         console.log('Angular app generation mode');
         await generateAngularApp(sourceDir, getNgBuildParams(), CODEGEN_INSTALLATION, appTarget, baseDir);
     } else if (buildType === BUILD_TYPE.WM) {
-        await buildAppInWMMode(sourceDir, baseDir);
+        buildAppInWMMode(sourceDir, baseDir);
     } else if (buildType === BUILD_TYPE.ANGULAR) {
         if(!isWebComponentBuild) {
             await generateAngularApp(sourceDir, getNgBuildParams(), CODEGEN_INSTALLATION, appTarget, baseDir);

package/download-packages.js CHANGED Viewed

@@ -2,7 +2,6 @@ const fs = require('fs');
 const { executeSyncCmd } = require('./build-util');
 const os = require('os');
 const path = require('path');
-const rimraf = require('rimraf');
 /**
@@ -17,6 +16,7 @@ const isNPMPackageExist = (path, msg) => {
         if (successMsg == msg) {
             return true;
         }
     } else {
         return false;
     }
@@ -29,120 +29,52 @@ const isNPMPackageExist = (path, msg) => {
  *  Run npm install
  *  Write  success file to be make sure it was installed successfully.
  */
-const downloadNPMPackage = async (packageInfo) => {
+const downloadNPMPackage = (packageInfo) => {
     const HOME_DIR = os.homedir();
     const PATH_NPM_PACKAGE = (packageInfo.baseDir || HOME_DIR + '/.wm/node_modules/') + packageInfo.name + '/' + packageInfo.version;
-    const PATH_NPM_PACKAGE_SUCCESS = PATH_NPM_PACKAGE + '/.SUCCESS', LOCK_FILE = path.join(PATH_NPM_PACKAGE, ".LOCK");
+    const PATH_NPM_PACKAGE_SUCCESS = PATH_NPM_PACKAGE + '/.SUCCESS';
     let isError = false;
-    try {
-        if (!packageInfo.baseDir) { // going to install in the .wm folder if baseDir is not defined(optimizeUIBuild true)
-            // To check node modules.
-            if (!isNPMPackageExist(PATH_NPM_PACKAGE_SUCCESS, packageInfo.successMsg)) {
-                // Check if another process is already installing
-                if (fs.existsSync(LOCK_FILE)) {
-                    console.log(`Waiting for another build to complete npm install... for package ${packageInfo.name}`);
-                    await waitForLock(LOCK_FILE, 20 * 60 * 1000); // Wait for 20 minutes (timeout in milliseconds)
-                } else {
-                    // Acquire the lock
-                    fs.mkdirSync(PATH_NPM_PACKAGE, { recursive: true });
-                    fs.writeFileSync(LOCK_FILE, "PROGRESS");
-                    await processPackage(packageInfo, PATH_NPM_PACKAGE);
-                    //only create a .SUCCESS file when there is no error
-                    if(!isError) {
-                        isError = false;
-                        fs.writeFileSync(PATH_NPM_PACKAGE_SUCCESS, packageInfo.successMsg);
-                    }
+    // To check global app runtime node modules.
+    if (!isNPMPackageExist(PATH_NPM_PACKAGE_SUCCESS, packageInfo.successMsg)) {
+        fs.mkdirSync(PATH_NPM_PACKAGE, { recursive: true });
+        let npmInstallCMD = 'npm install --legacy-peer-deps ';
+        if (packageInfo.packageJsonFile && fs.existsSync(packageInfo.packageJsonFile)) {
+            fs.copyFileSync(packageInfo.packageJsonFile, PATH_NPM_PACKAGE + '/package.json');
+            try {
+                //expecting this lock file to be present for exact versions to be downloaded from private registry
+                fs.copyFileSync(`${path.dirname(packageInfo.packageJsonFile)} + /package-lock.json`, `${PATH_NPM_PACKAGE} + /package-lock.json`);
+            } catch (err) {
+                if (err.code === 'ENOENT') {
+                    console.error(`Info: package-lock.json file not found at ${path.dirname(packageInfo.packageJsonFile)}`);
                 }
-            } else {
-                console.log(packageInfo.infoMsg + ` Node packages already installed! for package ${packageInfo.name}`);
             }
         } else {
-            await processPackage(packageInfo, PATH_NPM_PACKAGE);
-        }
-    } catch (err) {
-        deleteFiles([PATH_NPM_PACKAGE_SUCCESS, LOCK_FILE])
-        console.log(`Something went wrong while installing - for package ${packageInfo.name}`, err);
-        process.exit(err.code || err.pid);
-    } finally {
-        //cleanup : in windows / optimizeUIBuild is false, we need to delete the temp downloaded package
-        if (!packageInfo.baseDir) {
-            deleteFiles([LOCK_FILE]);
+            npmInstallCMD = 'npm init -y && ' + npmInstallCMD;
+            npmInstallCMD += packageInfo.skipPackageVersion === true
+                ? packageInfo.name
+                : packageInfo.scope + '/' + packageInfo.name + '@' + packageInfo.version;
         }
-    }
-    return PATH_NPM_PACKAGE;
-}
-const processPackage = (packageInfo, PATH_NPM_PACKAGE) => {
-    let npmInstallCMD = 'npm install --legacy-peer-deps ';
-    if (packageInfo.packageJsonFile && fs.existsSync(packageInfo.packageJsonFile)) {
-        fs.copyFileSync(packageInfo.packageJsonFile, PATH_NPM_PACKAGE + '/package.json');
-        try {
-            //expecting this lock file to be present for exact versions to be downloaded from private registry
-            fs.copyFileSync(`${path.dirname(packageInfo.packageJsonFile)} + /package-lock.json`, `${PATH_NPM_PACKAGE} + /package-lock.json`);
-        } catch (err) {
-            if (err.code === 'ENOENT') {
-                console.error(`Info: package-lock.json file not found at ${path.dirname(packageInfo.packageJsonFile)}`);
-            }
+        executeSyncCmd('cd ' + PATH_NPM_PACKAGE + ' && ' + npmInstallCMD, (errMsg) => {
+            isError = true;
+            console.log(packageInfo.infoMsg + ' Something wrong with npm installation ', errMsg);
+        },  packageInfo.infoMsg);
+        //only create a .SUCCESS file when there is no error
+        if(!isError) {
+            isError = false;
+            fs.writeFileSync(PATH_NPM_PACKAGE_SUCCESS, packageInfo.successMsg);
         }
     } else {
-        npmInstallCMD = 'npm init -y && ' + npmInstallCMD;
-        npmInstallCMD += packageInfo.skipPackageVersion === true
-            ? packageInfo.name
-            : packageInfo.scope + '/' + packageInfo.name + '@' + packageInfo.version;
+        console.log(packageInfo.infoMsg + ' Node packages already installed!');
     }
-    fs.mkdirSync(PATH_NPM_PACKAGE, { recursive: true });
-    executeSyncCmd('cd ' + PATH_NPM_PACKAGE + ' && ' + npmInstallCMD, (errMsg) => {
-        console.log(packageInfo.infoMsg + ' Something wrong with npm installation ', errMsg);
-        throw Error(errMsg);
-    },  packageInfo.infoMsg);
-}
+    return PATH_NPM_PACKAGE;
-/**
- *
- */
-const deleteFiles = (files) => {
-    files.forEach(file => {
-        try {
-            rimraf.sync(file);
-            console.log(`Successfully deleted file - ${file}`);
-        } catch (err) {
-            console.error(`Error while deleting file ${file}`, err);
-            throw new Error(`Error while deleting file: ${file}, Error: ${err}`);
-        }
-    });
 }
-/**
- *
- * @param lockFile
- * @param timeout
- * @returns {Promise<void>}
- */
-const waitForLock = async (lockFile, timeout) => {
-    timeout = timeout || 20 * 60 * 1000 // Wait for 20 minutes (timeout in milliseconds)
-    // Helper function to wait for the lock to be released with a timeout
-    const startTime = Date.now();
-    while (fs.existsSync(lockFile)) {
-        if (Date.now() - startTime > timeout) {
-            console.error('Timeout!! - waiting for the lock to be released. Exiting...');
-            process.exit(1); // Terminate the process with an error code
-        }
-        await sleep(1000); // Wait for 1 second before checking again
-    }
-};
-/**
- *
- * @param ms
- * @returns {Promise<unknown>}
- */
-const sleep = (ms) => {
-    // Helper function to sleep for a given time
-    return new Promise(resolve => setTimeout(resolve, ms));
-};
 module.exports = {
     downloadNPMPackage

package/npm-shrinkwrap.json CHANGED Viewed

@@ -1,15 +1,15 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.11.0-rc.6112",
+    "version": "11.11.0-rc.6115",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@wavemaker/angular-codegen",
-            "version": "11.11.0-rc.6112",
+            "version": "11.11.0-rc.6115",
             "license": "ISC",
             "dependencies": {
-                "@wavemaker/angular-app": "11.11.0-rc.6112",
+                "@wavemaker/angular-app": "11.11.0-rc.6115",
                 "archiver": "^7.0.1",
                 "cheerio": "1.0.0-rc.12",
                 "decode-uri-component": "^0.2.0",
@@ -1411,8 +1411,8 @@
             "license": "MIT"
         },
         "node_modules/@wavemaker/angular-app": {
-            "version": "11.11.0-rc.6112",
-            "integrity": "sha512-vtRY39NPfrJQft07++VW4mrHlFBE7wGej4FoJWNMIfn9772ql6Zv5monwL+UsknuIiNywGGVtsmQbFc0xvZfng==",
+            "version": "11.11.0-rc.6115",
+            "integrity": "sha512-Xs0cQDuRbddVNP3zZZW5sHN4y7Op41ZxXJqHXbrW76QJkhjKkTYzLxVGto5E9aIp0g7EZXXkXOgOa8Kk4OL5TQ==",
             "dependencies": {
                 "@angular/animations": "18.2.13",
                 "@angular/common": "18.2.13",
@@ -1430,12 +1430,12 @@
                 "@fullcalendar/list": "6.1.15",
                 "@fullcalendar/timegrid": "6.1.15",
                 "@metrichor/jmespath": "0.3.1",
-                "@wavemaker/app-ng-runtime": "11.11.0-rc.6112",
-                "@wavemaker/custom-widgets-m3": "11.11.0-rc.6112",
+                "@wavemaker/app-ng-runtime": "11.11.0-rc.6115",
+                "@wavemaker/custom-widgets-m3": "11.11.0-rc.6115",
                 "@wavemaker/focus-trap": "1.0.1",
-                "@wavemaker/foundation-css": "11.11.0-rc.6112",
+                "@wavemaker/foundation-css": "11.11.0-rc.6115",
                 "@wavemaker/nvd3": "1.8.12",
-                "@wavemaker/variables": "11.11.0-rc.6112",
+                "@wavemaker/variables": "11.11.0-rc.6115",
                 "@ztree/ztree_v3": "3.5.48",
                 "angular-imask": "^7.6.1",
                 "angular2-websocket": "0.9.7",
@@ -1474,8 +1474,8 @@
             }
         },
         "node_modules/@wavemaker/app-ng-runtime": {
-            "version": "11.11.0-rc.6112",
-            "integrity": "sha512-ATDN1BwkK7gOWoTArI7DLhj+3txztxCMbum4c40TnmG/DN9+W+id+fKyJgaJ8hLvjjtyKhlfsejxsLMpBlFbWQ==",
+            "version": "11.11.0-rc.6115",
+            "integrity": "sha512-mFxYU6T0ZRkYMQglmjaPm7OEx/wdwUvwoCiozSzUhkc/UC6fxFdSmMnSlgdXquvPRaLhXjYlPrG1HWGPln1WFQ==",
             "license": "MIT",
             "engines": {
                 "node": ">=18.16.1",
@@ -1483,8 +1483,8 @@
             }
         },
         "node_modules/@wavemaker/custom-widgets-m3": {
-            "version": "11.11.0-rc.6112",
-            "integrity": "sha512-CIS1Yw9qNByO545btY0WmnNtKG0+FKTrcxiI4cmOnLg6H60DSxv9QbffdX8t8HzZcytp1nBhSdhaK6+OdCZb/g==",
+            "version": "11.11.0-rc.6115",
+            "integrity": "sha512-/0vxCAQ7tzRcWv5VMbu4LYZwXeqhvOkUindCPCIqeidK/LgOj3gY/njMDxG+PMkuCMsHuj19dBQPgs2d0nFDOQ==",
             "license": "ISC"
         },
         "node_modules/@wavemaker/focus-trap": {
@@ -1497,8 +1497,8 @@
             }
         },
         "node_modules/@wavemaker/foundation-css": {
-            "version": "11.11.0-rc.6112",
-            "integrity": "sha512-2LRrrTbsH9GKiYWnO4OIgNMpuQ2bv1p2qXYPqNj2JgLxkJrpNew0QxqilIv8jGe20vtxIhfP9rfVMG/DqS8N4A==",
+            "version": "11.11.0-rc.6115",
+            "integrity": "sha512-91kmhXk2F/BRhQVhA1yk6AKwUjbU2fuYKQnYaOuOzzFQ3RFrgRAPysxPoqQ+SnSCfwphVJ8oLW5uS2ff/w0UUQ==",
             "license": "ISC",
             "dependencies": {
                 "chroma-js": "^3.1.2"
@@ -1513,8 +1513,8 @@
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "11.11.0-rc.6112",
-            "integrity": "sha512-yXg/R1dLdwY/tVkFXFeJsfR5IVjEcbBgYi2tFeKUZMZrTm3W/+qeQbJ/RsxP6Afuc8xCXCyhEu3k4j8WwTO53Q==",
+            "version": "11.11.0-rc.6115",
+            "integrity": "sha512-xLKKtCMpOY3JCmT4KRWUSyxvouN2KGkMNmNENnJHAjfimOfmMb8KhUPryL0noTPr47eRcCMZryxH+++654jnYw==",
             "license": "ISC",
             "dependencies": {
                 "@metrichor/jmespath": "^0.3.1",
@@ -2191,8 +2191,8 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001713",
-            "integrity": "sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==",
+            "version": "1.0.30001714",
+            "integrity": "sha512-mtgapdwDLSSBnCI3JokHM7oEQBLxiJKVRtg10AxM1AyeiKcM96f0Mkbqeq+1AbiCtvMcHRulAAEMu693JrSWqg==",
             "dev": true,
             "funding": [
                 {
@@ -3270,8 +3270,8 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.137",
-            "integrity": "sha512-/QSJaU2JyIuTbbABAo/crOs+SuAZLS+fVVS10PVrIT9hrRkmZl8Hb0xPSkKRUUWHQtYzXHpQUW3Dy5hwMzGZkA==",
+            "version": "1.5.138",
+            "integrity": "sha512-FWlQc52z1dXqm+9cCJ2uyFgJkESd+16j6dBEjsgDNuHjBpuIzL8/lRc0uvh1k8RNI6waGo6tcy2DvwkTBJOLDg==",
             "dev": true,
             "license": "ISC"
         },

package/package-lock.json CHANGED Viewed

@@ -1,15 +1,15 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.11.0-rc.6112",
+    "version": "11.11.0-rc.6115",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@wavemaker/angular-codegen",
-            "version": "11.11.0-rc.6112",
+            "version": "11.11.0-rc.6115",
             "license": "ISC",
             "dependencies": {
-                "@wavemaker/angular-app": "11.11.0-rc.6112",
+                "@wavemaker/angular-app": "11.11.0-rc.6115",
                 "archiver": "^7.0.1",
                 "cheerio": "1.0.0-rc.12",
                 "decode-uri-component": "^0.2.0",
@@ -1411,8 +1411,8 @@
             "license": "MIT"
         },
         "node_modules/@wavemaker/angular-app": {
-            "version": "11.11.0-rc.6112",
-            "integrity": "sha512-vtRY39NPfrJQft07++VW4mrHlFBE7wGej4FoJWNMIfn9772ql6Zv5monwL+UsknuIiNywGGVtsmQbFc0xvZfng==",
+            "version": "11.11.0-rc.6115",
+            "integrity": "sha512-Xs0cQDuRbddVNP3zZZW5sHN4y7Op41ZxXJqHXbrW76QJkhjKkTYzLxVGto5E9aIp0g7EZXXkXOgOa8Kk4OL5TQ==",
             "dependencies": {
                 "@angular/animations": "18.2.13",
                 "@angular/common": "18.2.13",
@@ -1430,12 +1430,12 @@
                 "@fullcalendar/list": "6.1.15",
                 "@fullcalendar/timegrid": "6.1.15",
                 "@metrichor/jmespath": "0.3.1",
-                "@wavemaker/app-ng-runtime": "11.11.0-rc.6112",
-                "@wavemaker/custom-widgets-m3": "11.11.0-rc.6112",
+                "@wavemaker/app-ng-runtime": "11.11.0-rc.6115",
+                "@wavemaker/custom-widgets-m3": "11.11.0-rc.6115",
                 "@wavemaker/focus-trap": "1.0.1",
-                "@wavemaker/foundation-css": "11.11.0-rc.6112",
+                "@wavemaker/foundation-css": "11.11.0-rc.6115",
                 "@wavemaker/nvd3": "1.8.12",
-                "@wavemaker/variables": "11.11.0-rc.6112",
+                "@wavemaker/variables": "11.11.0-rc.6115",
                 "@ztree/ztree_v3": "3.5.48",
                 "angular-imask": "^7.6.1",
                 "angular2-websocket": "0.9.7",
@@ -1474,8 +1474,8 @@
             }
         },
         "node_modules/@wavemaker/app-ng-runtime": {
-            "version": "11.11.0-rc.6112",
-            "integrity": "sha512-ATDN1BwkK7gOWoTArI7DLhj+3txztxCMbum4c40TnmG/DN9+W+id+fKyJgaJ8hLvjjtyKhlfsejxsLMpBlFbWQ==",
+            "version": "11.11.0-rc.6115",
+            "integrity": "sha512-mFxYU6T0ZRkYMQglmjaPm7OEx/wdwUvwoCiozSzUhkc/UC6fxFdSmMnSlgdXquvPRaLhXjYlPrG1HWGPln1WFQ==",
             "license": "MIT",
             "engines": {
                 "node": ">=18.16.1",
@@ -1483,8 +1483,8 @@
             }
         },
         "node_modules/@wavemaker/custom-widgets-m3": {
-            "version": "11.11.0-rc.6112",
-            "integrity": "sha512-CIS1Yw9qNByO545btY0WmnNtKG0+FKTrcxiI4cmOnLg6H60DSxv9QbffdX8t8HzZcytp1nBhSdhaK6+OdCZb/g==",
+            "version": "11.11.0-rc.6115",
+            "integrity": "sha512-/0vxCAQ7tzRcWv5VMbu4LYZwXeqhvOkUindCPCIqeidK/LgOj3gY/njMDxG+PMkuCMsHuj19dBQPgs2d0nFDOQ==",
             "license": "ISC"
         },
         "node_modules/@wavemaker/focus-trap": {
@@ -1497,8 +1497,8 @@
             }
         },
         "node_modules/@wavemaker/foundation-css": {
-            "version": "11.11.0-rc.6112",
-            "integrity": "sha512-2LRrrTbsH9GKiYWnO4OIgNMpuQ2bv1p2qXYPqNj2JgLxkJrpNew0QxqilIv8jGe20vtxIhfP9rfVMG/DqS8N4A==",
+            "version": "11.11.0-rc.6115",
+            "integrity": "sha512-91kmhXk2F/BRhQVhA1yk6AKwUjbU2fuYKQnYaOuOzzFQ3RFrgRAPysxPoqQ+SnSCfwphVJ8oLW5uS2ff/w0UUQ==",
             "license": "ISC",
             "dependencies": {
                 "chroma-js": "^3.1.2"
@@ -1513,8 +1513,8 @@
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "11.11.0-rc.6112",
-            "integrity": "sha512-yXg/R1dLdwY/tVkFXFeJsfR5IVjEcbBgYi2tFeKUZMZrTm3W/+qeQbJ/RsxP6Afuc8xCXCyhEu3k4j8WwTO53Q==",
+            "version": "11.11.0-rc.6115",
+            "integrity": "sha512-xLKKtCMpOY3JCmT4KRWUSyxvouN2KGkMNmNENnJHAjfimOfmMb8KhUPryL0noTPr47eRcCMZryxH+++654jnYw==",
             "license": "ISC",
             "dependencies": {
                 "@metrichor/jmespath": "^0.3.1",
@@ -2191,8 +2191,8 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001713",
-            "integrity": "sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==",
+            "version": "1.0.30001714",
+            "integrity": "sha512-mtgapdwDLSSBnCI3JokHM7oEQBLxiJKVRtg10AxM1AyeiKcM96f0Mkbqeq+1AbiCtvMcHRulAAEMu693JrSWqg==",
             "dev": true,
             "funding": [
                 {
@@ -3270,8 +3270,8 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.137",
-            "integrity": "sha512-/QSJaU2JyIuTbbABAo/crOs+SuAZLS+fVVS10PVrIT9hrRkmZl8Hb0xPSkKRUUWHQtYzXHpQUW3Dy5hwMzGZkA==",
+            "version": "1.5.138",
+            "integrity": "sha512-FWlQc52z1dXqm+9cCJ2uyFgJkESd+16j6dBEjsgDNuHjBpuIzL8/lRc0uvh1k8RNI6waGo6tcy2DvwkTBJOLDg==",
             "dev": true,
             "license": "ISC"
         },

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.11.0-rc.6112",
+    "version": "11.11.0-rc.6115",
     "description": "",
     "main": "index.js",
     "scripts": {
@@ -15,7 +15,7 @@
         ".npmrc"
     ],
     "dependencies": {
-        "@wavemaker/angular-app": "11.11.0-rc.6112",
+        "@wavemaker/angular-app": "11.11.0-rc.6115",
         "archiver": "^7.0.1",
         "cheerio": "1.0.0-rc.12",
         "decode-uri-component": "^0.2.0",

package/templates/app.config.ts.hbs CHANGED Viewed

@@ -72,10 +72,7 @@ const wmModules = [
         BsDatepickerModule.forRoot(),
         NgCircleProgressModule.forRoot(),
         WmComponentsModule.forRoot(),
-        RuntimeBaseModule.forRoot(),
-        {{#if isPwa}}
-        ServiceWorkerModule.register("wmsw-worker.js", { enabled: environment.production })
-        {{/if}}
+        RuntimeBaseModule.forRoot()
     )
 ];
 export const xsrfHeaderName = "{{xsrfTokenHeaderName}}";
@@ -123,6 +120,9 @@ export const appConfig: ApplicationConfig = {
         // Other application-wide services
         CanDeactivateNgPageGuard,
         LazyLoadScriptsResolve,
-        ...wmModules
+        ...wmModules,
+        {{#if isPwa}}
+        ServiceWorkerModule.register("wmsw-worker.js", { enabled: environment.production })
+        {{/if}}
     ]
 };