@wavemaker/angular-codegen 11.8.0-rc.5686 → 11.8.0-rc.5688

{angular-codegen → package}/angular-app/package-lock.json

@@ -1,12 +1,13 @@
 {
-    "name": "wavemaker-ng-runtime-new",
+    "name": "@wavemaker/angular-app",
     "version": "0.0.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
-            "name": "wavemaker-ng-runtime-new",
+            "name": "@wavemaker/angular-app",
             "version": "0.0.0",
+            "license": "MIT",
             "dependencies": {
                 "@angular/animations": "17.3.11",
                 "@angular/common": "17.3.11",
@@ -36,7 +37,7 @@
                 "@metrichor/jmespath": "0.3.1",
                 "@wavemaker/focus-trap": "1.0.1",
                 "@wavemaker/nvd3": "1.8.11",
-                "@wavemaker/variables": "11.8.0-rc.5686",
+                "@wavemaker/variables": "11.8.0-rc.5688",
                 "@ztree/ztree_v3": "3.5.48",
                 "angular-imask": "^7.6.1",
                 "angular2-websocket": "0.9.7",
@@ -6452,9 +6453,9 @@
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "11.8.0-rc.5686",
-            "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-11.8.0-rc.5686.tgz",
-            "integrity": "sha512-PD/eIiJUn0+KrAjgsjOCI9PcCxVL3DU7ODeNP9TVn55hvuSfyVrocx8ZAkB1I906boG5SV/xB5x85zJB283LfQ==",
+            "version": "11.8.0-rc.5688",
+            "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-11.8.0-rc.5688.tgz",
+            "integrity": "sha512-Gv7QIykwf1pTo7NCB6AgU/O8wwmQqynWdlXNRr4/CWyrXgpz8prj5yjOcWHf8WQkD1dVhnjksWeU9MhrhS7F0w==",
             "dependencies": {
                 "@metrichor/jmespath": "^0.3.1",
                 "he": "^1.2.0",

{angular-codegen → package}/angular-app/package.json

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

{angular-codegen → package}/build-angular-app.js

@@ -13,9 +13,10 @@
  *  optimizeUIBuild : By default this flag will be true. If it's windows platform we are making the flag to false, it means no optimisation for windows.
  */
 const fs = require('fs');
-const { downloadNPMPackage } = require('./download-packages');
-
 const { executeSyncCmd,  MSG_NG_RUNTIME_LOG, MSG_NG_RUNTIME_SUCCESS } = require('./build-util');
+const os = require("os");
+
+const NPM_PACKAGE_SCOPE = '@wavemaker';
 
 /**
  * @TODO: This is a temporary workaround to extract deploy-url from 'ngBuildParams', need to be replaced in future.
@@ -43,24 +44,41 @@ 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';
+
+    fs.mkdirSync(TARBALL_DOWNLOAD_PATH, { recursive: true });
+    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 = {
-        name: 'app-ng-runtime',
+        scope: NPM_PACKAGE_SCOPE,
+        name: APP_NAME,
         version: args.runtimeUIVersion,
-        packageJsonFile: args.codegenPath + '/angular-app/package.json',
+        packageJsonFile: `${TARBALL_DOWNLOAD_PATH}/package/package.json`,
+        packageJsonLockFile: `${TARBALL_DOWNLOAD_PATH}/package/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
-            let pathNGRuntimePackage = downloadNPMPackage(packageInfo);
-            fs.symlinkSync(pathNGRuntimePackage + '/node_modules', args.appTarget + '/node_modules', 'dir');
+            fs.copyFileSync(TARBALL_DOWNLOAD_PATH + `/package/package.json`, TARBALL_DOWNLOAD_PATH + '/package.json');
+            fs.copyFileSync(TARBALL_DOWNLOAD_PATH + `/package/package-lock.json`, TARBALL_DOWNLOAD_PATH + '/package-lock.json');
+            fs.copyFileSync(TARBALL_DOWNLOAD_PATH + `/package/.npmrc`, TARBALL_DOWNLOAD_PATH + '/.npmrc');
+
+            // Download angular-app node_modules
+            executeSyncCmd('cd ' + TARBALL_DOWNLOAD_PATH + ' && npm install ', null, "Installing app dependencies...");
+
+            // Symlink to reuse the existing node_modules
+            fs.symlinkSync(TARBALL_DOWNLOAD_PATH + `/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(TARBALL_DOWNLOAD_PATH + `/package/package/package.json`, args.appTarget + '/package.json');
+            fs.copyFileSync(TARBALL_DOWNLOAD_PATH + `/package/package-lock.json`, args.appTarget + '/package-lock.json');
+            fs.copyFileSync(TARBALL_DOWNLOAD_PATH + `/package/.npmrc`, args.appTarget + '/.npmrc');
+            executeSyncCmd('cd ' + args.appTarget + ` && npm install `, null, MSG_NG_RUNTIME_LOG);
         }
     } catch (err) {
         console.log(MSG_NG_RUNTIME_LOG + 'FAILED the symlink for the node_modules', err);