@wavemaker/angular-codegen 11.8.0-next.141671 → 11.8.0-next.141677

package/.npmrc

@@ -0,0 +1 @@
+legacy-peer-deps = true

package/angular-app/.npmrc

@@ -0,0 +1 @@
+legacy-peer-deps = true

package/angular-app/package-lock.json

@@ -1,12 +1,12 @@
 {
-    "name": "@wavemaker/app-ng-runtime",
-    "version": "0.0.0",
+    "name": "@wavemaker/angular-app",
+    "version": "11.8.0-next.141677",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
-            "name": "@wavemaker/app-ng-runtime",
-            "version": "0.0.0",
+            "name": "@wavemaker/angular-app",
+            "version": "11.8.0-next.141677",
             "bundleDependencies": [
                 "@angular/animations",
                 "@angular/common",
@@ -60,7 +60,8 @@
                 "ts-jest",
                 "tslib",
                 "x2js",
-                "zone.js"
+                "zone.js",
+                "@wavemaker/app-ng-runtime"
             ],
             "license": "MIT",
             "dependencies": {
@@ -90,9 +91,10 @@
                 "@awesome-cordova-plugins/vibration": "5.39.1",
                 "@babel/runtime": "7.14.8",
                 "@metrichor/jmespath": "0.3.1",
+                "@wavemaker/app-ng-runtime": "11.8.0-next.141677",
                 "@wavemaker/focus-trap": "1.0.1",
                 "@wavemaker/nvd3": "1.8.11",
-                "@wavemaker/variables": "11.8.0-next.141671",
+                "@wavemaker/variables": "11.8.0-next.141677",
                 "@ztree/ztree_v3": "3.5.48",
                 "angular-imask": "^7.6.1",
                 "angular2-websocket": "0.9.7",
@@ -6547,6 +6549,16 @@
                 "vite": "^3.0.0 || ^4.0.0 || ^5.0.0"
             }
         },
+        "node_modules/@wavemaker/app-ng-runtime": {
+            "version": "11.8.0-next.141677",
+            "resolved": "https://registry.npmjs.org/@wavemaker/app-ng-runtime/-/app-ng-runtime-11.8.0-next.141677.tgz",
+            "integrity": "sha512-NoZNvYbe1fi+rC9haBJ5Pm2FFzKfErbA6+hPRn7vFOZtKpzOpA5vaCIkNHsRdGM31spncM17mzlFVTD5kFCwcg==",
+            "inBundle": true,
+            "engines": {
+                "node": ">=18.16.1",
+                "npm": ">=9.5.1"
+            }
+        },
         "node_modules/@wavemaker/focus-trap": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/@wavemaker/focus-trap/-/focus-trap-1.0.1.tgz",
@@ -6567,9 +6579,9 @@
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "11.8.0-next.141671",
-            "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-11.8.0-next.141671.tgz",
-            "integrity": "sha512-Rg1nr2tUOGhm0XYuznbvLQ2zWJwziiybuHs2r/GauPvRjOsXD39oS9/W51opAbxms/O3nh0t8UQW6b620TS+pg==",
+            "version": "11.8.0-next.141677",
+            "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-11.8.0-next.141677.tgz",
+            "integrity": "sha512-J9texGL4LwyClmZF5c+IxevVEVgYaxyZaqmE4xZoU2ZG6wbyNSXK/1+Ikp6pqDzTLdVCQd9XbU5UxfM2w35ssQ==",
             "bundleDependencies": [
                 "@metrichor/jmespath",
                 "he",
@@ -6586,6 +6598,51 @@
                 "x2js": "^3.4.3"
             }
         },
+        "node_modules/@wavemaker/variables/node_modules/@metrichor/jmespath": {
+            "version": "0.3.1",
+            "inBundle": true,
+            "license": "MPL-2.0",
+            "engines": {
+                "node": ">=10.0.0"
+            }
+        },
+        "node_modules/@wavemaker/variables/node_modules/@xmldom/xmldom": {
+            "version": "0.8.10",
+            "inBundle": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10.0.0"
+            }
+        },
+        "node_modules/@wavemaker/variables/node_modules/he": {
+            "version": "1.2.0",
+            "inBundle": true,
+            "license": "MIT",
+            "bin": {
+                "he": "bin/he"
+            }
+        },
+        "node_modules/@wavemaker/variables/node_modules/lodash": {
+            "version": "4.17.21",
+            "inBundle": true,
+            "license": "MIT"
+        },
+        "node_modules/@wavemaker/variables/node_modules/moment": {
+            "version": "2.30.1",
+            "inBundle": true,
+            "license": "MIT",
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/@wavemaker/variables/node_modules/x2js": {
+            "version": "3.4.4",
+            "inBundle": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@xmldom/xmldom": "^0.8.3"
+            }
+        },
         "node_modules/@webassemblyjs/ast": {
             "version": "1.12.1",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
@@ -12983,15 +13040,6 @@
                 "node": ">= 0.4"
             }
         },
-        "node_modules/he": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-            "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-            "inBundle": true,
-            "bin": {
-                "he": "bin/he"
-            }
-        },
         "node_modules/hmac-drbg": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -16850,7 +16898,7 @@
             "version": "4.17.21",
             "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
             "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-            "inBundle": true
+            "dev": true
         },
         "node_modules/lodash-es": {
             "version": "4.17.21",
@@ -17646,7 +17694,7 @@
             "version": "2.29.4",
             "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
             "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
-            "inBundle": true,
+            "dev": true,
             "engines": {
                 "node": "*"
             }

package/angular-app/package.json

@@ -1,6 +1,6 @@
 {
-    "name": "@wavemaker/app-ng-runtime",
-    "version": "0.0.0",
+    "name": "@wavemaker/angular-app",
+    "version": "11.8.0-next.141677",
     "scripts": {
         "ng": "ng",
         "start": "./node_modules/.bin/ng serve",
@@ -47,7 +47,7 @@
         "@metrichor/jmespath": "0.3.1",
         "@wavemaker/focus-trap": "1.0.1",
         "@wavemaker/nvd3": "1.8.11",
-        "@wavemaker/variables": "11.8.0-next.141671",
+        "@wavemaker/variables": "11.8.0-next.141677",
         "@ztree/ztree_v3": "3.5.48",
         "angular-imask": "^7.6.1",
         "angular2-websocket": "0.9.7",
@@ -72,7 +72,7 @@
         "tslib": "2.4.1",
         "x2js": "3.4.4",
         "zone.js": "0.14.7",
-        "@wavemaker/app-ng-runtime": "11.8.0-next.141671"
+        "@wavemaker/app-ng-runtime": "11.8.0-next.141677"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "^0.27.0",
@@ -126,5 +126,9 @@
         "node": ">=18.16.1",
         "npm": ">=9.5.1"
     },
-    "engineStrict": true
+    "engineStrict": true,
+    "files": [
+        "**/*",
+        ".npmrc"
+    ]
 }

package/angular-app/src/setup-jest.js

@@ -1,14 +1,14 @@
 import "jest-preset-angular/setup-jest";
 import { ToastrModule } from 'ngx-toastr';
 import { TestBed } from '@angular/core/testing';
+import _ from 'lodash-es';
 
 // Mock global objects if necessary
 global.jQuery = require("jquery");
 global.$ = global.jQuery;
+global._ = _;
 
 
-
-global._ = require("lodash");
 global.moment = require("moment");
 class IntersectionObserver {
     constructor(callback, options) {

package/angular-app/tsconfig.json

@@ -8,6 +8,7 @@
         "sourceMap": true,
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
+        "esModuleInterop": true,
         "moduleResolution": "node",
         "target": "ES2022",
         "module": "ES2022",

package/build-angular-app.js

@@ -44,23 +44,24 @@ const updateDeployUrl = (args) => {
  */
 const buildAngularApp = (args) => {
     let packageInfo = {
-        name: 'app-ng-runtime',
+        name: '@wavemaker/angular-app',
         version: args.runtimeUIVersion,
         packageJsonFile: args.codegenPath + '/angular-app/package.json',
+        packageLockJsonFile: args.codegenPath + '/angular-app/package-lock.json',
         successMsg: MSG_NG_RUNTIME_SUCCESS,
         infoMsg: MSG_NG_RUNTIME_LOG
-
     }
 
     try {
         // Symlink to reuse the existing node_modules
         if (args.optimizeUIBuild) {
-            // Download app-ng-runtime node modules
+            // Download angular-app node_modules
             let pathNGRuntimePackage = downloadNPMPackage(packageInfo);
-            fs.symlinkSync(pathNGRuntimePackage + '/node_modules', args.appTarget + '/node_modules', 'dir');
+            fs.symlinkSync(pathNGRuntimePackage + `/node_modules/${packageInfo.name}/node_modules`, args.appTarget + '/node_modules', 'dir');
         } else {
-            fs.copyFileSync(packageInfo.packageJsonFile, args.appTarget + '/package.json');
-            executeSyncCmd('cd ' + args.appTarget + ' && npm install', null, MSG_NG_RUNTIME_LOG);
+            // fs.copyFileSync(packageInfo.packageJsonFile, args.appTarget + '/package.json');
+            // fs.copyFileSync(packageInfo.packageLockJsonFile, args.appTarget + '/package-lock.json');
+            executeSyncCmd('cd ' + args.appTarget + ` && npm install ${packageInfo.name}@${packageInfo.version}`, null, MSG_NG_RUNTIME_LOG);
         }
     } catch (err) {
         console.log(MSG_NG_RUNTIME_LOG + 'FAILED the symlink for the node_modules', err);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.8.0-next.141671",
+    "version": "11.8.0-next.141677",
     "description": "",
     "main": "index.js",
     "scripts": {
@@ -35,5 +35,10 @@
         "node": ">=18.16.1",
         "npm": ">=9.5.1"
     },
-    "engineStrict": true
+    "engineStrict": true,
+    "files": [
+        "**/*",
+        ".npmrc",
+        "angular-app/.npmrc"
+    ]
 }