@wavemaker/angular-codegen 11.8.0-rc.5697 → 11.8.0-rc.5720

package/angular-app/package-lock.json

@@ -1,13 +1,12 @@
 {
     "name": "@wavemaker/angular-app",
-    "version": "0.0.0",
+    "version": "11.8.0-rc.5720",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@wavemaker/angular-app",
-            "version": "0.0.0",
-            "license": "MIT",
+            "version": "11.8.0-rc.5720",
             "dependencies": {
                 "@angular/animations": "17.3.11",
                 "@angular/common": "17.3.11",
@@ -35,9 +34,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-rc.5720",
                 "@wavemaker/focus-trap": "1.0.1",
                 "@wavemaker/nvd3": "1.8.11",
-                "@wavemaker/variables": "11.8.0-rc.5697",
+                "@wavemaker/variables": "11.8.0-rc.5720",
                 "@ztree/ztree_v3": "3.5.48",
                 "angular-imask": "^7.6.1",
                 "angular2-websocket": "0.9.7",
@@ -6435,6 +6435,15 @@
                 "vite": "^3.0.0 || ^4.0.0 || ^5.0.0"
             }
         },
+        "node_modules/@wavemaker/app-ng-runtime": {
+            "version": "11.8.0-rc.5720",
+            "resolved": "https://registry.npmjs.org/@wavemaker/app-ng-runtime/-/app-ng-runtime-11.8.0-rc.5720.tgz",
+            "integrity": "sha512-p+axlAbYhRBDf6C/OMufYl08XvFDMurUU/Bcy2rixe0vAcCVjeIzvgBkP2SYti1GLRAS3TcfrZoK53qjInl50Q==",
+            "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",
@@ -6453,9 +6462,9 @@
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "11.8.0-rc.5697",
-            "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-11.8.0-rc.5697.tgz",
-            "integrity": "sha512-GNRYm6cZawn3HaOu6xG46cf7oMKqybQzDDht5l6mgQ/Dkn4sLZa3O+oWXsGfslyx4A857LniGrFU0sf9jHPZLA==",
+            "version": "11.8.0-rc.5720",
+            "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-11.8.0-rc.5720.tgz",
+            "integrity": "sha512-SQZfpRo1SdTF/5xhfBey1lyfwwxITR7BOODqdxdMlTw1qwnZaegf3Dx1ut0y4TJrArl++mSjHDGXCRPcgciKpA==",
             "dependencies": {
                 "@metrichor/jmespath": "^0.3.1",
                 "he": "^1.2.0",

package/angular-app/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-app",
-    "version": "11.8.0-rc.5697",
+    "version": "11.8.0-rc.5720",
     "scripts": {
         "ng": "ng",
         "start": "./node_modules/.bin/ng serve",
@@ -15,8 +15,10 @@
         "optimizecss": "gulp --gulpfile build-scripts/optimize-css.gulpfile.js",
         "owasp": "owasp-dependency-check --project \"wavemaker-ng-runtime\" -f \"ALL\""
     },
-    "author": "Wavemaker",
-    "license": "MIT",
+    "files": [
+        "**/*",
+        ".npmrc"
+    ],
     "dependencies": {
         "@angular/animations": "17.3.11",
         "@angular/common": "17.3.11",
@@ -46,7 +48,7 @@
         "@metrichor/jmespath": "0.3.1",
         "@wavemaker/focus-trap": "1.0.1",
         "@wavemaker/nvd3": "1.8.11",
-        "@wavemaker/variables": "11.8.0-rc.5697",
+        "@wavemaker/variables": "11.8.0-rc.5720",
         "@ztree/ztree_v3": "3.5.48",
         "angular-imask": "^7.6.1",
         "angular2-websocket": "0.9.7",
@@ -71,7 +73,7 @@
         "tslib": "2.4.1",
         "x2js": "3.4.4",
         "zone.js": "0.14.7",
-        "@wavemaker/app-ng-runtime": "11.8.0-rc.5697"
+        "@wavemaker/app-ng-runtime": "11.8.0-rc.5720"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "^0.27.0",
@@ -126,9 +128,5 @@
         "node": ">=18.16.1",
         "npm": ">=9.5.1"
     },
-    "engineStrict": true,
-    "files": [
-        "**/*",
-        ".npmrc"
-    ]
+    "engineStrict": true
 }

package/build-angular-app.js

@@ -44,18 +44,19 @@ const updateDeployUrl = (args) => {
  * Run the ng build and post build for the project
  */
 const buildAngularApp = (args) => {
-    const HOME_DIR = os.homedir(), APP_NAME = "angular-app";
-    const TARBALL_DOWNLOAD_PATH = (HOME_DIR + '/.wm/node_modules') + '/' + APP_NAME + '/' + args.runtimeUIVersion;
-    const PACKAGE_NAME = NPM_PACKAGE_SCOPE + '/' + APP_NAME + '@' + args.runtimeUIVersion;
-    const TARBALL_NAME = 'wavemaker' + '-' + APP_NAME + '-' + args.runtimeUIVersion + '.tgz';
+    const HOME_DIR = os.homedir(), ANGULAR_APP_TEMPLATE_NAME = "angular-app";
+    const TARBALL_DOWNLOAD_PATH = (HOME_DIR + '/.wm/node_modules') + '/' + ANGULAR_APP_TEMPLATE_NAME + '/' + args.runtimeUIVersion;
+    const PACKAGE_NAME = NPM_PACKAGE_SCOPE + '/' + ANGULAR_APP_TEMPLATE_NAME + '@' + args.runtimeUIVersion;
+    const TARBALL_NAME = 'wavemaker' + '-' + ANGULAR_APP_TEMPLATE_NAME + '-' + args.runtimeUIVersion + '.tgz';
 
     fs.mkdirSync(TARBALL_DOWNLOAD_PATH, { recursive: true });
+    //npm pack will download the given package as a tar file
     executeSyncCmd('cd ' + TARBALL_DOWNLOAD_PATH + ` && npm pack ${PACKAGE_NAME}`, null, `Downloading tarball - ${PACKAGE_NAME} to the location - ${TARBALL_DOWNLOAD_PATH}`);
     executeSyncCmd('cd ' + TARBALL_DOWNLOAD_PATH + ` && tar -xvf ${TARBALL_NAME}`, null, `Unzipping the tarball - ${TARBALL_NAME}`);
 
     let packageInfo = {
         scope: NPM_PACKAGE_SCOPE,
-        name: APP_NAME,
+        name: ANGULAR_APP_TEMPLATE_NAME,
         version: args.runtimeUIVersion,
         packageJsonFile: `${TARBALL_DOWNLOAD_PATH}/package/package.json`,
         packageJsonLockFile: `${TARBALL_DOWNLOAD_PATH}/package/package-lock.json`,

package/download-packages.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const { executeSyncCmd } = require('./build-util');
 const os = require('os');
+const path = require('path');
 
 
 /**
@@ -40,6 +41,14 @@ const downloadNPMPackage = (packageInfo) => {
         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 {
             npmInstallCMD = 'npm init -y &&  ' + npmInstallCMD + packageInfo.scope + '/' + packageInfo.name + '@' + packageInfo.version;
         }