npm - @wavemaker/angular-codegen - Versions diffs - 11.11.0-rc.6113 → 11.11.0-rc.6116 - Mend

@wavemaker/angular-codegen 11.11.0-rc.6113 → 11.11.0-rc.6116

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 (14) hide show

package/angular-app/dependency-report.html +1 -1
package/angular-app/npm-shrinkwrap.json +25 -25
package/angular-app/package-lock.json +25 -25
package/angular-app/package.json +5 -5
package/angular-app/src/index.html +1 -2
package/angular-app/src/main.ts +1 -3
package/build-angular-app.js +11 -7
package/download-packages.js +99 -31
package/npm-shrinkwrap.json +21 -21
package/package-lock.json +21 -21
package/package.json +2 -2
package/src/gen-index-html.js +1 -1
package/templates/app.config.ts.hbs +5 -5
package/angular-app/src/app/bootstrap-wrapper.component.ts +0 -10

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/18/2025, 4:46:28 PM</p>
+        <p class="timestamp">Generated on: 4/22/2025, 3:23:19 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.6113",
+    "version": "11.11.0-rc.6116",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@wavemaker/angular-app",
-            "version": "11.11.0-rc.6113",
+            "version": "11.11.0-rc.6116",
             "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.6113",
-                "@wavemaker/custom-widgets-m3": "11.11.0-rc.6113",
+                "@wavemaker/app-ng-runtime": "11.11.0-rc.6116",
+                "@wavemaker/custom-widgets-m3": "11.11.0-rc.6116",
                 "@wavemaker/focus-trap": "1.0.1",
-                "@wavemaker/foundation-css": "11.11.0-rc.6113",
+                "@wavemaker/foundation-css": "11.11.0-rc.6116",
                 "@wavemaker/nvd3": "1.8.12",
-                "@wavemaker/variables": "11.11.0-rc.6113",
+                "@wavemaker/variables": "11.11.0-rc.6116",
                 "@ztree/ztree_v3": "3.5.48",
                 "angular-imask": "^7.6.1",
                 "angular2-websocket": "0.9.7",
@@ -7999,8 +7999,8 @@
             }
         },
         "node_modules/@wavemaker/app-ng-runtime": {
-            "version": "11.11.0-rc.6113",
-            "integrity": "sha512-PptnqVDPl7iGDoYCTizKOYkv/T3V/9js7Q3whm9Lk/78AIox9E2FI5ibz2oUkja1ax3wY4TLltBIw53ZHdXRdw==",
+            "version": "11.11.0-rc.6116",
+            "integrity": "sha512-0ufbra68l1MCsHQUVB6sQ/2VFRrbAEr0632jrw6K6uOFd+azOQQ2H3qCw7QSJ8uYQkSCDgV6rBuGh93e4+HvIA==",
             "license": "MIT",
             "engines": {
                 "node": ">=18.16.1",
@@ -8008,8 +8008,8 @@
             }
         },
         "node_modules/@wavemaker/custom-widgets-m3": {
-            "version": "11.11.0-rc.6113",
-            "integrity": "sha512-VPFP9bBd0VSG6jqLluZY2F6ywxwmsRwWenKuqS7EZB91wsZWPnCsDIYk/jiwUjMA/WaociXzIVYdduXBpjybSA==",
+            "version": "11.11.0-rc.6116",
+            "integrity": "sha512-A0IMMdm+oX030r7Rg6U9f+vbdvW66+TMyMGYfHfjoVNIAXfnuqxftJh45ZLVTACJ+IZ9b0XTqJgjEZJOZCvbaA==",
             "license": "ISC"
         },
         "node_modules/@wavemaker/focus-trap": {
@@ -8022,8 +8022,8 @@
             }
         },
         "node_modules/@wavemaker/foundation-css": {
-            "version": "11.11.0-rc.6113",
-            "integrity": "sha512-onEb5g4zJKArlGNvQHV+PcvcZF/liAeyYGYI0FBHqLlJcl+TaFlhmGdp4d/jdlDXYWRuNRgKX6tTBru5TUYgEg==",
+            "version": "11.11.0-rc.6116",
+            "integrity": "sha512-3P62uYy3sGDBL+cjkPZdeweKTgUxtnTybk0PNOVDv9/Db3yoL19wgMYhNE4qggu+ozeSDpeJ9QfdCbsDcW+z4w==",
             "license": "ISC",
             "dependencies": {
                 "chroma-js": "^3.1.2"
@@ -8038,8 +8038,8 @@
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "11.11.0-rc.6113",
-            "integrity": "sha512-FXKZKgepGXBe1aYxwOVVB1cf2tYW8z0z+5T84CrjencJGb/zOS49R9mZgjQQHUw3SDuUyXj6RGJhZhjdqAvqtQ==",
+            "version": "11.11.0-rc.6116",
+            "integrity": "sha512-p+rGqulFbc6Xn5glf6StuzivZPCjmgUVD2LO4RyS5fltEozVqo0kwm4oZcWZ/12aogm46tPOQWZMSuWgtL9EjA==",
             "license": "ISC",
             "dependencies": {
                 "@metrichor/jmespath": "^0.3.1",
@@ -9553,8 +9553,8 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001714",
-            "integrity": "sha512-mtgapdwDLSSBnCI3JokHM7oEQBLxiJKVRtg10AxM1AyeiKcM96f0Mkbqeq+1AbiCtvMcHRulAAEMu693JrSWqg==",
+            "version": "1.0.30001715",
+            "integrity": "sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==",
             "dev": true,
             "funding": [
                 {
@@ -11635,8 +11635,8 @@
             }
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.138",
-            "integrity": "sha512-FWlQc52z1dXqm+9cCJ2uyFgJkESd+16j6dBEjsgDNuHjBpuIzL8/lRc0uvh1k8RNI6waGo6tcy2DvwkTBJOLDg==",
+            "version": "1.5.140",
+            "integrity": "sha512-o82Rj+ONp4Ip7Cl1r7lrqx/pXhbp/lh9DpKcMNscFJdh8ebyRofnc7Sh01B4jx403RI0oqTBvlZ7OBIZLMr2+Q==",
             "dev": true,
             "license": "ISC"
         },
@@ -12714,8 +12714,8 @@
             }
         },
         "node_modules/fdir": {
-            "version": "6.4.3",
-            "integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==",
+            "version": "6.4.4",
+            "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
             "dev": true,
             "license": "MIT",
             "peerDependencies": {
@@ -22785,8 +22785,8 @@
             "license": "MIT"
         },
         "node_modules/tablesort": {
-            "version": "5.5.0",
-            "integrity": "sha512-/yi34JHVmfuzwtK+6O/rhxbIimNp+eAZGXlVz8pWTyoJggAs8lDf76bsbjeGpE2sbvsNmIR9u8a0KfUj0YGGvw==",
+            "version": "5.6.0",
+            "integrity": "sha512-cZZXK3G089PbpxH8N7vN7Z21SEKqXAaCiSVOmZdR/v7z8TFCsF/OFr0rzjhQuFlQQHy9uQtW9P2oQFJzJFGVrg==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -23055,12 +23055,12 @@
             "license": "MIT"
         },
         "node_modules/tinyglobby": {
-            "version": "0.2.12",
-            "integrity": "sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==",
+            "version": "0.2.13",
+            "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "fdir": "^6.4.3",
+                "fdir": "^6.4.4",
                 "picomatch": "^4.0.2"
             },
             "engines": {

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

@@ -1,12 +1,12 @@
 {
     "name": "@wavemaker/angular-app",
-    "version": "11.11.0-rc.6113",
+    "version": "11.11.0-rc.6116",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@wavemaker/angular-app",
-            "version": "11.11.0-rc.6113",
+            "version": "11.11.0-rc.6116",
             "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.6113",
-                "@wavemaker/custom-widgets-m3": "11.11.0-rc.6113",
+                "@wavemaker/app-ng-runtime": "11.11.0-rc.6116",
+                "@wavemaker/custom-widgets-m3": "11.11.0-rc.6116",
                 "@wavemaker/focus-trap": "1.0.1",
-                "@wavemaker/foundation-css": "11.11.0-rc.6113",
+                "@wavemaker/foundation-css": "11.11.0-rc.6116",
                 "@wavemaker/nvd3": "1.8.12",
-                "@wavemaker/variables": "11.11.0-rc.6113",
+                "@wavemaker/variables": "11.11.0-rc.6116",
                 "@ztree/ztree_v3": "3.5.48",
                 "angular-imask": "^7.6.1",
                 "angular2-websocket": "0.9.7",
@@ -7999,8 +7999,8 @@
             }
         },
         "node_modules/@wavemaker/app-ng-runtime": {
-            "version": "11.11.0-rc.6113",
-            "integrity": "sha512-PptnqVDPl7iGDoYCTizKOYkv/T3V/9js7Q3whm9Lk/78AIox9E2FI5ibz2oUkja1ax3wY4TLltBIw53ZHdXRdw==",
+            "version": "11.11.0-rc.6116",
+            "integrity": "sha512-0ufbra68l1MCsHQUVB6sQ/2VFRrbAEr0632jrw6K6uOFd+azOQQ2H3qCw7QSJ8uYQkSCDgV6rBuGh93e4+HvIA==",
             "license": "MIT",
             "engines": {
                 "node": ">=18.16.1",
@@ -8008,8 +8008,8 @@
             }
         },
         "node_modules/@wavemaker/custom-widgets-m3": {
-            "version": "11.11.0-rc.6113",
-            "integrity": "sha512-VPFP9bBd0VSG6jqLluZY2F6ywxwmsRwWenKuqS7EZB91wsZWPnCsDIYk/jiwUjMA/WaociXzIVYdduXBpjybSA==",
+            "version": "11.11.0-rc.6116",
+            "integrity": "sha512-A0IMMdm+oX030r7Rg6U9f+vbdvW66+TMyMGYfHfjoVNIAXfnuqxftJh45ZLVTACJ+IZ9b0XTqJgjEZJOZCvbaA==",
             "license": "ISC"
         },
         "node_modules/@wavemaker/focus-trap": {
@@ -8022,8 +8022,8 @@
             }
         },
         "node_modules/@wavemaker/foundation-css": {
-            "version": "11.11.0-rc.6113",
-            "integrity": "sha512-onEb5g4zJKArlGNvQHV+PcvcZF/liAeyYGYI0FBHqLlJcl+TaFlhmGdp4d/jdlDXYWRuNRgKX6tTBru5TUYgEg==",
+            "version": "11.11.0-rc.6116",
+            "integrity": "sha512-3P62uYy3sGDBL+cjkPZdeweKTgUxtnTybk0PNOVDv9/Db3yoL19wgMYhNE4qggu+ozeSDpeJ9QfdCbsDcW+z4w==",
             "license": "ISC",
             "dependencies": {
                 "chroma-js": "^3.1.2"
@@ -8038,8 +8038,8 @@
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "11.11.0-rc.6113",
-            "integrity": "sha512-FXKZKgepGXBe1aYxwOVVB1cf2tYW8z0z+5T84CrjencJGb/zOS49R9mZgjQQHUw3SDuUyXj6RGJhZhjdqAvqtQ==",
+            "version": "11.11.0-rc.6116",
+            "integrity": "sha512-p+rGqulFbc6Xn5glf6StuzivZPCjmgUVD2LO4RyS5fltEozVqo0kwm4oZcWZ/12aogm46tPOQWZMSuWgtL9EjA==",
             "license": "ISC",
             "dependencies": {
                 "@metrichor/jmespath": "^0.3.1",
@@ -9553,8 +9553,8 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001714",
-            "integrity": "sha512-mtgapdwDLSSBnCI3JokHM7oEQBLxiJKVRtg10AxM1AyeiKcM96f0Mkbqeq+1AbiCtvMcHRulAAEMu693JrSWqg==",
+            "version": "1.0.30001715",
+            "integrity": "sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==",
             "dev": true,
             "funding": [
                 {
@@ -11635,8 +11635,8 @@
             }
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.138",
-            "integrity": "sha512-FWlQc52z1dXqm+9cCJ2uyFgJkESd+16j6dBEjsgDNuHjBpuIzL8/lRc0uvh1k8RNI6waGo6tcy2DvwkTBJOLDg==",
+            "version": "1.5.140",
+            "integrity": "sha512-o82Rj+ONp4Ip7Cl1r7lrqx/pXhbp/lh9DpKcMNscFJdh8ebyRofnc7Sh01B4jx403RI0oqTBvlZ7OBIZLMr2+Q==",
             "dev": true,
             "license": "ISC"
         },
@@ -12714,8 +12714,8 @@
             }
         },
         "node_modules/fdir": {
-            "version": "6.4.3",
-            "integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==",
+            "version": "6.4.4",
+            "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
             "dev": true,
             "license": "MIT",
             "peerDependencies": {
@@ -22785,8 +22785,8 @@
             "license": "MIT"
         },
         "node_modules/tablesort": {
-            "version": "5.5.0",
-            "integrity": "sha512-/yi34JHVmfuzwtK+6O/rhxbIimNp+eAZGXlVz8pWTyoJggAs8lDf76bsbjeGpE2sbvsNmIR9u8a0KfUj0YGGvw==",
+            "version": "5.6.0",
+            "integrity": "sha512-cZZXK3G089PbpxH8N7vN7Z21SEKqXAaCiSVOmZdR/v7z8TFCsF/OFr0rzjhQuFlQQHy9uQtW9P2oQFJzJFGVrg==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -23055,12 +23055,12 @@
             "license": "MIT"
         },
         "node_modules/tinyglobby": {
-            "version": "0.2.12",
-            "integrity": "sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==",
+            "version": "0.2.13",
+            "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "fdir": "^6.4.3",
+                "fdir": "^6.4.4",
                 "picomatch": "^4.0.2"
             },
             "engines": {

package/angular-app/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-app",
-    "version": "11.11.0-rc.6113",
+    "version": "11.11.0-rc.6116",
     "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.6113",
+        "@wavemaker/custom-widgets-m3": "11.11.0-rc.6116",
         "@wavemaker/focus-trap": "1.0.1",
-        "@wavemaker/foundation-css": "11.11.0-rc.6113",
+        "@wavemaker/foundation-css": "11.11.0-rc.6116",
         "@wavemaker/nvd3": "1.8.12",
-        "@wavemaker/variables": "11.11.0-rc.6113",
+        "@wavemaker/variables": "11.11.0-rc.6116",
         "@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.6113"
+        "@wavemaker/app-ng-runtime": "11.11.0-rc.6116"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "^0.27.0",

package/angular-app/src/index.html CHANGED Viewed

@@ -11,8 +11,7 @@
     <link rel="icon" type="image/x-icon" href="favicon.ico">
 </head>
-<body class="wm-app">
-    <bootstrap-wrapper></bootstrap-wrapper>
+<body class="wm-app">
     <app-root></app-root>
 </body>
 </html>

package/angular-app/src/main.ts CHANGED Viewed

@@ -6,7 +6,6 @@ import { WMAppProperties } from './app/wmProperties';
 import * as fontConfig from './font.config';
 import { appConfig } from './app/app.config';
 import { AppComponent } from '@wm/runtime/base';
-import { BootstrapWrapperComponent } from './app/bootstrap-wrapper.component';
 // Format Accept-Language header
 const formatAcceptHeader = (languages: string[]): string => {
@@ -51,10 +50,9 @@ if (environment.production) {
 document.addEventListener('DOMContentLoaded', () => {
   new Promise<Event | void>(resolve => {
-      resolve();
+    resolve();
   }).then(() => bootstrapApplication(AppComponent, appConfig))
     .then((appRef: ApplicationRef) => {
-      appRef.bootstrap(BootstrapWrapperComponent);
       window.addEventListener('unload', () => {
         appRef.components.map(c => c?.destroy());
       });

package/build-angular-app.js CHANGED Viewed

@@ -148,10 +148,11 @@ 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...');
+                    console.log(`Waiting for another build to complete npm install... for package ${PACKAGE_NAME}`);
                     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");
@@ -166,11 +167,13 @@ const buildAngularApp = async (args) => {
         }
     } catch (err) {
         deleteFiles([SUCCESS_FILE, LOCK_FILE])
-        console.log(MSG_NG_RUNTIME_LOG + 'Something went wrong - ', err);
+        console.log(MSG_NG_RUNTIME_LOG + `Something went wrong - for package ${PACKAGE_NAME}`, err);
         process.exit(err.code || err.pid);
     } finally {
         //cleanup : in windows / optimizeUIBuild is false, we need to delete the temp downloaded package
-        deleteFiles([path.join(TARBALL_DOWNLOAD_PATH, 'package'), path.join(TARBALL_DOWNLOAD_PATH, ANGULAR_APP_TARBALL_NAME), LOCK_FILE])
+        if (args.optimizeUIBuild) {
+            deleteFiles([path.join(TARBALL_DOWNLOAD_PATH, 'package'), path.join(TARBALL_DOWNLOAD_PATH, ANGULAR_APP_TARBALL_NAME), LOCK_FILE])
+        }
     }
     let ngBuildParams = updateDeployUrl(args);
@@ -308,9 +311,10 @@ 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 = (sourceDir, baseDir) => {
+const buildAppInWMMode = async (sourceDir, baseDir) => {
     /**
      * Download app-runtime-wm-build package and install if it doesn't exist
@@ -325,7 +329,7 @@ const buildAppInWMMode = (sourceDir, baseDir) => {
     };
     appRuntimeWMBuildPackageInfo.baseDir = baseDir;
-    const PATH_WAVEMAKER_APP_RUNTIME_WM_BUILD = downloadNPMPackage(appRuntimeWMBuildPackageInfo);
+    const PATH_WAVEMAKER_APP_RUNTIME_WM_BUILD = await downloadNPMPackage(appRuntimeWMBuildPackageInfo);
     const FILE_PATH_WAVEMAKER_APP_RUNTIME_WM_BUILD = PATH_WAVEMAKER_APP_RUNTIME_WM_BUILD + '/node_modules/' + appRuntimeWMBuildPackageInfo.scope + '/' + appRuntimeWMBuildPackageInfo.name + '/';
@@ -456,7 +460,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);
@@ -469,7 +473,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) {
-        buildAppInWMMode(sourceDir, baseDir);
+        await 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,6 +2,7 @@ const fs = require('fs');
 const { executeSyncCmd } = require('./build-util');
 const os = require('os');
 const path = require('path');
+const rimraf = require('rimraf');
 /**
@@ -16,7 +17,6 @@ const isNPMPackageExist = (path, msg) => {
         if (successMsg == msg) {
             return true;
         }
     } else {
         return false;
     }
@@ -29,52 +29,120 @@ const isNPMPackageExist = (path, msg) => {
  *  Run npm install
  *  Write  success file to be make sure it was installed successfully.
  */
-const downloadNPMPackage = (packageInfo) => {
+const downloadNPMPackage = async (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';
+    const PATH_NPM_PACKAGE_SUCCESS = PATH_NPM_PACKAGE + '/.SUCCESS', LOCK_FILE = path.join(PATH_NPM_PACKAGE, ".LOCK");
     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);
-    // 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)}`);
+                    //only create a .SUCCESS file when there is no error
+                    if(!isError) {
+                        isError = false;
+                        fs.writeFileSync(PATH_NPM_PACKAGE_SUCCESS, packageInfo.successMsg);
+                    }
                 }
+            } else {
+                console.log(packageInfo.infoMsg + ` Node packages already installed! for package ${packageInfo.name}`);
             }
         } else {
-            npmInstallCMD = 'npm init -y && ' + npmInstallCMD;
-            npmInstallCMD += packageInfo.skipPackageVersion === true
-                ? packageInfo.name
-                : packageInfo.scope + '/' + packageInfo.name + '@' + packageInfo.version;
+            await processPackage(packageInfo, PATH_NPM_PACKAGE);
         }
-        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);
+    } 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]);
         }
+    }
+    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)}`);
+            }
+        }
     } else {
-        console.log(packageInfo.infoMsg + ' Node packages already installed!');
+        npmInstallCMD = 'npm init -y && ' + npmInstallCMD;
+        npmInstallCMD += packageInfo.skipPackageVersion === true
+            ? packageInfo.name
+            : packageInfo.scope + '/' + packageInfo.name + '@' + packageInfo.version;
     }
-    return PATH_NPM_PACKAGE;
+    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);
+}
+/**
+ *
+ */
+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.6113",
+    "version": "11.11.0-rc.6116",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@wavemaker/angular-codegen",
-            "version": "11.11.0-rc.6113",
+            "version": "11.11.0-rc.6116",
             "license": "ISC",
             "dependencies": {
-                "@wavemaker/angular-app": "11.11.0-rc.6113",
+                "@wavemaker/angular-app": "11.11.0-rc.6116",
                 "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.6113",
-            "integrity": "sha512-3+/MagAmJlvENF+977+mzA7GQOsrc+O+k2WY3LQAeoxFgTngJ+l4GclBEM0b7ORCVsIY+XQsFEMdolTh4aOhxw==",
+            "version": "11.11.0-rc.6116",
+            "integrity": "sha512-neUFRoF/PJPeycxP/r5DtM+9SeKNqDCEa4TMrImzMyPhWu6edrEwICcmgWDI58YAqKmFRS3pj62vjyCCo5KjwQ==",
             "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.6113",
-                "@wavemaker/custom-widgets-m3": "11.11.0-rc.6113",
+                "@wavemaker/app-ng-runtime": "11.11.0-rc.6116",
+                "@wavemaker/custom-widgets-m3": "11.11.0-rc.6116",
                 "@wavemaker/focus-trap": "1.0.1",
-                "@wavemaker/foundation-css": "11.11.0-rc.6113",
+                "@wavemaker/foundation-css": "11.11.0-rc.6116",
                 "@wavemaker/nvd3": "1.8.12",
-                "@wavemaker/variables": "11.11.0-rc.6113",
+                "@wavemaker/variables": "11.11.0-rc.6116",
                 "@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.6113",
-            "integrity": "sha512-PptnqVDPl7iGDoYCTizKOYkv/T3V/9js7Q3whm9Lk/78AIox9E2FI5ibz2oUkja1ax3wY4TLltBIw53ZHdXRdw==",
+            "version": "11.11.0-rc.6116",
+            "integrity": "sha512-0ufbra68l1MCsHQUVB6sQ/2VFRrbAEr0632jrw6K6uOFd+azOQQ2H3qCw7QSJ8uYQkSCDgV6rBuGh93e4+HvIA==",
             "license": "MIT",
             "engines": {
                 "node": ">=18.16.1",
@@ -1483,8 +1483,8 @@
             }
         },
         "node_modules/@wavemaker/custom-widgets-m3": {
-            "version": "11.11.0-rc.6113",
-            "integrity": "sha512-VPFP9bBd0VSG6jqLluZY2F6ywxwmsRwWenKuqS7EZB91wsZWPnCsDIYk/jiwUjMA/WaociXzIVYdduXBpjybSA==",
+            "version": "11.11.0-rc.6116",
+            "integrity": "sha512-A0IMMdm+oX030r7Rg6U9f+vbdvW66+TMyMGYfHfjoVNIAXfnuqxftJh45ZLVTACJ+IZ9b0XTqJgjEZJOZCvbaA==",
             "license": "ISC"
         },
         "node_modules/@wavemaker/focus-trap": {
@@ -1497,8 +1497,8 @@
             }
         },
         "node_modules/@wavemaker/foundation-css": {
-            "version": "11.11.0-rc.6113",
-            "integrity": "sha512-onEb5g4zJKArlGNvQHV+PcvcZF/liAeyYGYI0FBHqLlJcl+TaFlhmGdp4d/jdlDXYWRuNRgKX6tTBru5TUYgEg==",
+            "version": "11.11.0-rc.6116",
+            "integrity": "sha512-3P62uYy3sGDBL+cjkPZdeweKTgUxtnTybk0PNOVDv9/Db3yoL19wgMYhNE4qggu+ozeSDpeJ9QfdCbsDcW+z4w==",
             "license": "ISC",
             "dependencies": {
                 "chroma-js": "^3.1.2"
@@ -1513,8 +1513,8 @@
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "11.11.0-rc.6113",
-            "integrity": "sha512-FXKZKgepGXBe1aYxwOVVB1cf2tYW8z0z+5T84CrjencJGb/zOS49R9mZgjQQHUw3SDuUyXj6RGJhZhjdqAvqtQ==",
+            "version": "11.11.0-rc.6116",
+            "integrity": "sha512-p+rGqulFbc6Xn5glf6StuzivZPCjmgUVD2LO4RyS5fltEozVqo0kwm4oZcWZ/12aogm46tPOQWZMSuWgtL9EjA==",
             "license": "ISC",
             "dependencies": {
                 "@metrichor/jmespath": "^0.3.1",
@@ -2191,8 +2191,8 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001714",
-            "integrity": "sha512-mtgapdwDLSSBnCI3JokHM7oEQBLxiJKVRtg10AxM1AyeiKcM96f0Mkbqeq+1AbiCtvMcHRulAAEMu693JrSWqg==",
+            "version": "1.0.30001715",
+            "integrity": "sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==",
             "dev": true,
             "funding": [
                 {
@@ -3270,8 +3270,8 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.138",
-            "integrity": "sha512-FWlQc52z1dXqm+9cCJ2uyFgJkESd+16j6dBEjsgDNuHjBpuIzL8/lRc0uvh1k8RNI6waGo6tcy2DvwkTBJOLDg==",
+            "version": "1.5.140",
+            "integrity": "sha512-o82Rj+ONp4Ip7Cl1r7lrqx/pXhbp/lh9DpKcMNscFJdh8ebyRofnc7Sh01B4jx403RI0oqTBvlZ7OBIZLMr2+Q==",
             "dev": true,
             "license": "ISC"
         },

package/package-lock.json CHANGED Viewed

@@ -1,15 +1,15 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.11.0-rc.6113",
+    "version": "11.11.0-rc.6116",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@wavemaker/angular-codegen",
-            "version": "11.11.0-rc.6113",
+            "version": "11.11.0-rc.6116",
             "license": "ISC",
             "dependencies": {
-                "@wavemaker/angular-app": "11.11.0-rc.6113",
+                "@wavemaker/angular-app": "11.11.0-rc.6116",
                 "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.6113",
-            "integrity": "sha512-3+/MagAmJlvENF+977+mzA7GQOsrc+O+k2WY3LQAeoxFgTngJ+l4GclBEM0b7ORCVsIY+XQsFEMdolTh4aOhxw==",
+            "version": "11.11.0-rc.6116",
+            "integrity": "sha512-neUFRoF/PJPeycxP/r5DtM+9SeKNqDCEa4TMrImzMyPhWu6edrEwICcmgWDI58YAqKmFRS3pj62vjyCCo5KjwQ==",
             "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.6113",
-                "@wavemaker/custom-widgets-m3": "11.11.0-rc.6113",
+                "@wavemaker/app-ng-runtime": "11.11.0-rc.6116",
+                "@wavemaker/custom-widgets-m3": "11.11.0-rc.6116",
                 "@wavemaker/focus-trap": "1.0.1",
-                "@wavemaker/foundation-css": "11.11.0-rc.6113",
+                "@wavemaker/foundation-css": "11.11.0-rc.6116",
                 "@wavemaker/nvd3": "1.8.12",
-                "@wavemaker/variables": "11.11.0-rc.6113",
+                "@wavemaker/variables": "11.11.0-rc.6116",
                 "@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.6113",
-            "integrity": "sha512-PptnqVDPl7iGDoYCTizKOYkv/T3V/9js7Q3whm9Lk/78AIox9E2FI5ibz2oUkja1ax3wY4TLltBIw53ZHdXRdw==",
+            "version": "11.11.0-rc.6116",
+            "integrity": "sha512-0ufbra68l1MCsHQUVB6sQ/2VFRrbAEr0632jrw6K6uOFd+azOQQ2H3qCw7QSJ8uYQkSCDgV6rBuGh93e4+HvIA==",
             "license": "MIT",
             "engines": {
                 "node": ">=18.16.1",
@@ -1483,8 +1483,8 @@
             }
         },
         "node_modules/@wavemaker/custom-widgets-m3": {
-            "version": "11.11.0-rc.6113",
-            "integrity": "sha512-VPFP9bBd0VSG6jqLluZY2F6ywxwmsRwWenKuqS7EZB91wsZWPnCsDIYk/jiwUjMA/WaociXzIVYdduXBpjybSA==",
+            "version": "11.11.0-rc.6116",
+            "integrity": "sha512-A0IMMdm+oX030r7Rg6U9f+vbdvW66+TMyMGYfHfjoVNIAXfnuqxftJh45ZLVTACJ+IZ9b0XTqJgjEZJOZCvbaA==",
             "license": "ISC"
         },
         "node_modules/@wavemaker/focus-trap": {
@@ -1497,8 +1497,8 @@
             }
         },
         "node_modules/@wavemaker/foundation-css": {
-            "version": "11.11.0-rc.6113",
-            "integrity": "sha512-onEb5g4zJKArlGNvQHV+PcvcZF/liAeyYGYI0FBHqLlJcl+TaFlhmGdp4d/jdlDXYWRuNRgKX6tTBru5TUYgEg==",
+            "version": "11.11.0-rc.6116",
+            "integrity": "sha512-3P62uYy3sGDBL+cjkPZdeweKTgUxtnTybk0PNOVDv9/Db3yoL19wgMYhNE4qggu+ozeSDpeJ9QfdCbsDcW+z4w==",
             "license": "ISC",
             "dependencies": {
                 "chroma-js": "^3.1.2"
@@ -1513,8 +1513,8 @@
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "11.11.0-rc.6113",
-            "integrity": "sha512-FXKZKgepGXBe1aYxwOVVB1cf2tYW8z0z+5T84CrjencJGb/zOS49R9mZgjQQHUw3SDuUyXj6RGJhZhjdqAvqtQ==",
+            "version": "11.11.0-rc.6116",
+            "integrity": "sha512-p+rGqulFbc6Xn5glf6StuzivZPCjmgUVD2LO4RyS5fltEozVqo0kwm4oZcWZ/12aogm46tPOQWZMSuWgtL9EjA==",
             "license": "ISC",
             "dependencies": {
                 "@metrichor/jmespath": "^0.3.1",
@@ -2191,8 +2191,8 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001714",
-            "integrity": "sha512-mtgapdwDLSSBnCI3JokHM7oEQBLxiJKVRtg10AxM1AyeiKcM96f0Mkbqeq+1AbiCtvMcHRulAAEMu693JrSWqg==",
+            "version": "1.0.30001715",
+            "integrity": "sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==",
             "dev": true,
             "funding": [
                 {
@@ -3270,8 +3270,8 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.138",
-            "integrity": "sha512-FWlQc52z1dXqm+9cCJ2uyFgJkESd+16j6dBEjsgDNuHjBpuIzL8/lRc0uvh1k8RNI6waGo6tcy2DvwkTBJOLDg==",
+            "version": "1.5.140",
+            "integrity": "sha512-o82Rj+ONp4Ip7Cl1r7lrqx/pXhbp/lh9DpKcMNscFJdh8ebyRofnc7Sh01B4jx403RI0oqTBvlZ7OBIZLMr2+Q==",
             "dev": true,
             "license": "ISC"
         },

package/package.json CHANGED Viewed

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

package/src/gen-index-html.js CHANGED Viewed

	@@ -1 +1 @@
1	- const{getIndexHtmlPath:getIndexHtmlPath,readFile:readFile,writeFile:writeFile,isMobileProject:isMobileProject,createDir:createDir}=require("./wm-utils"),{addToScripts:addToScripts}=require("./update-angular-json"),cheerio=require("cheerio"),prettier=require("prettier"),isResourceJS=e=>/^resources\/./.test(e),generateIndexHtml=async(e,r,t,i,n,s)=>{const o=await readFile(getIndexHtmlPath(e),"utf8"),a=cheerio.load(o);let c=[],l=[],m=!1,p=0,d=[];const h=["application/ld+json"];await createDir(r+"/resources/wm-inline",{recursive:!0}),a("script").each((e,r)=>{d.push(r)});for(const e of d){let t=a(e).attr("src");if(t)!m&&t.includes("wm-libs.min.js")&&(m=!0),isResourceJS(t)&&(m?l.push(t):c.push(t),a(e).remove());else if(!h.includes(a(e).attr("type"))){t=`resources/wm-inline/wm-inline-${++p}.js`;try{await writeFile(`${r}/${t}`,a(e).html()),m?l.push(t):c.push(t),a(e).remove()}catch(e){console.log(`WM-CODEGEN \| Error in inline script generation \| ${e}`)}}}await addToScripts(e,r,c,l),a('script[src$="/wm-loader.min.js"]').remove(),a('script[src$="/wm-libs.min.js"]').remove(),a('script[src$="/wm-mobileloader.min.js"]').remove();const u=a('meta[name="description"]');u.attr("content")\|\|u.attr("content","App built on wavemaker"),isMobileProject(t)&&a("body").append(a('script[src="cordova.js"]')),a('link[href$="/wm-style.css"]').remove(),a('link[href="print.css"]').remove(),a('link[theme="wmtheme"]').remove(),a('link[href$="wm-responsive.css"]').remove(),a('link[href^="themes"][href$="style.css"]').remove(),a('link[href="app.css"]').remove(),a('link[href$="foundation.css"]').remove(),a('link[href$="app.override.css"]').remove(),a("*").contents().each(function(){8===this.nodeType&&a(this).remove()});process.env.APPMETRICS_ENABLED,process.env.APPMETRICS_SERVER_URL;i?a('meta[name="cdnUrl"]').attr("content",i):a('meta[name="cdnUrl"]').remove(),s&&a("head").append('<meta name="apiUrl" content="'+s+'" />'),a('link[href^="favicon."]').attr("rel","icon"),n&&(a("head").append('<meta name="theme-color" content="#2c3049" />'),a("head").append('<link rel="manifest" href="manifest.json">'),a("head").append('<link rel="apple-touch-icon" href="ng-bundle/assets/icons/icon-192x192.png">')),~~a("app-root").before("<bootstrap-wrapper></bootstrap-wrapper>"),~~await writeFile(`${r}/src/index.html`,prettier.format(a.html(),{htmlWhitespaceSensitivity:"ignore",parser:"html",tabWidth:4}))};module.exports={generateIndexHtml:generateIndexHtml};
1	+ const{getIndexHtmlPath:getIndexHtmlPath,readFile:readFile,writeFile:writeFile,isMobileProject:isMobileProject,createDir:createDir}=require("./wm-utils"),{addToScripts:addToScripts}=require("./update-angular-json"),cheerio=require("cheerio"),prettier=require("prettier"),isResourceJS=e=>/^resources\/./.test(e),generateIndexHtml=async(e,r,t,i,n,s)=>{const o=await readFile(getIndexHtmlPath(e),"utf8"),a=cheerio.load(o);let c=[],l=[],m=!1,p=0,d=[];const h=["application/ld+json"];await createDir(r+"/resources/wm-inline",{recursive:!0}),a("script").each((e,r)=>{d.push(r)});for(const e of d){let t=a(e).attr("src");if(t)!m&&t.includes("wm-libs.min.js")&&(m=!0),isResourceJS(t)&&(m?l.push(t):c.push(t),a(e).remove());else if(!h.includes(a(e).attr("type"))){t=`resources/wm-inline/wm-inline-${++p}.js`;try{await writeFile(`${r}/${t}`,a(e).html()),m?l.push(t):c.push(t),a(e).remove()}catch(e){console.log(`WM-CODEGEN \| Error in inline script generation \| ${e}`)}}}await addToScripts(e,r,c,l),a('script[src$="/wm-loader.min.js"]').remove(),a('script[src$="/wm-libs.min.js"]').remove(),a('script[src$="/wm-mobileloader.min.js"]').remove();const u=a('meta[name="description"]');u.attr("content")\|\|u.attr("content","App built on wavemaker"),isMobileProject(t)&&a("body").append(a('script[src="cordova.js"]')),a('link[href$="/wm-style.css"]').remove(),a('link[href="print.css"]').remove(),a('link[theme="wmtheme"]').remove(),a('link[href$="wm-responsive.css"]').remove(),a('link[href^="themes"][href$="style.css"]').remove(),a('link[href="app.css"]').remove(),a('link[href$="foundation.css"]').remove(),a('link[href$="app.override.css"]').remove(),a("*").contents().each(function(){8===this.nodeType&&a(this).remove()});process.env.APPMETRICS_ENABLED,process.env.APPMETRICS_SERVER_URL;i?a('meta[name="cdnUrl"]').attr("content",i):a('meta[name="cdnUrl"]').remove(),s&&a("head").append('<meta name="apiUrl" content="'+s+'" />'),a('link[href^="favicon."]').attr("rel","icon"),n&&(a("head").append('<meta name="theme-color" content="#2c3049" />'),a("head").append('<link rel="manifest" href="manifest.json">'),a("head").append('<link rel="apple-touch-icon" href="ng-bundle/assets/icons/icon-192x192.png">')),await writeFile(`${r}/src/index.html`,prettier.format(a.html(),{htmlWhitespaceSensitivity:"ignore",parser:"html",tabWidth:4}))};module.exports={generateIndexHtml:generateIndexHtml};

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

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

package/angular-app/src/app/bootstrap-wrapper.component.ts DELETED Viewed

@@ -1,10 +0,0 @@
-import { Component } from "@angular/core";
-import { CommonModule } from "@angular/common";
-@Component({
-    standalone: true,
-    template: `<ng-content></ng-content>`,
-    imports: [CommonModule],
-    selector: 'bootstrap-wrapper',
-})
-export class BootstrapWrapperComponent { }