@wavemaker/angular-codegen 11.8.0-rc.5696 → 11.8.1-next.1417118

angular-codegen/angular-app/build-scripts/update-version.js

@@ -0,0 +1,24 @@
+'use strict';
+const fs = require('fs');
+const yargs = require('yargs');
+const argv = yargs(process.argv).argv;
+
+/**
+ * Updates the @wavemaker/app-ng-runtime dependency in the specified package.json file.
+ * @param {string} path - The path to the package.json file to update.
+ */
+
+const updateNgRuntimePackage = (path) => {
+    if (fs.existsSync(path)) {
+        const packageJSON = require('../' + path);
+        packageJSON['dependencies']['@wavemaker/app-ng-runtime'] = argv["publish-version"];
+        fs.writeFileSync(path, JSON.stringify(packageJSON, null, 4));
+    } else {
+        console.log('package.json not found at ' + path);
+    }
+};
+const init = () => {
+    updateNgRuntimePackage('../wavemaker-studio-runtime-integration/package.json');
+};
+
+init();

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

@@ -1,13 +1,12 @@
 {
-    "name": "@wavemaker/angular-app",
+    "name": "wavemaker-ng-runtime-new",
     "version": "0.0.0",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
-            "name": "@wavemaker/angular-app",
+            "name": "wavemaker-ng-runtime-new",
             "version": "0.0.0",
-            "license": "MIT",
             "dependencies": {
                 "@angular/animations": "17.3.11",
                 "@angular/common": "17.3.11",
@@ -37,7 +36,7 @@
                 "@metrichor/jmespath": "0.3.1",
                 "@wavemaker/focus-trap": "1.0.1",
                 "@wavemaker/nvd3": "1.8.11",
-                "@wavemaker/variables": "11.8.0-rc.5696",
+                "@wavemaker/variables": "11.8.1-next.1417118",
                 "@ztree/ztree_v3": "3.5.48",
                 "angular-imask": "^7.6.1",
                 "angular2-websocket": "0.9.7",
@@ -6453,9 +6452,9 @@
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "11.8.0-rc.5696",
-            "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-11.8.0-rc.5696.tgz",
-            "integrity": "sha512-Fje6gwO41YtIZ4hknv6etVII39FIN//P0xU6KSJjGm6aaxDkadAt5y+OyUUgRjw9kjm4yXNQaxqBPQMPubxxqw==",
+            "version": "11.8.1-next.1417118",
+            "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-11.8.1-next.1417118.tgz",
+            "integrity": "sha512-4EBfuQmjxPjmONpzYyqbNjEPwNScyo0kxtYNHXXRj7yPgNrch7evAa7MTQk77YNOWW0MmUvjUJJA9w6bLLrSLA==",
             "dependencies": {
                 "@metrichor/jmespath": "^0.3.1",
                 "he": "^1.2.0",

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

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

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

@@ -13,10 +13,9 @@
  *  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 { executeSyncCmd,  MSG_NG_RUNTIME_LOG, MSG_NG_RUNTIME_SUCCESS } = require('./build-util');
-const os = require("os");
+const { downloadNPMPackage } = require('./download-packages');
 
-const NPM_PACKAGE_SCOPE = '@wavemaker';
+const { executeSyncCmd,  MSG_NG_RUNTIME_LOG, MSG_NG_RUNTIME_SUCCESS } = require('./build-util');
 
 /**
  * @TODO: This is a temporary workaround to extract deploy-url from 'ngBuildParams', need to be replaced in future.
@@ -44,41 +43,24 @@ 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 = {
-        scope: NPM_PACKAGE_SCOPE,
-        name: APP_NAME,
+        name: 'app-ng-runtime',
         version: args.runtimeUIVersion,
-        packageJsonFile: `${TARBALL_DOWNLOAD_PATH}/package/package.json`,
-        packageJsonLockFile: `${TARBALL_DOWNLOAD_PATH}/package/package-lock.json`,
+        packageJsonFile: args.codegenPath + '/angular-app/package.json',
         successMsg: MSG_NG_RUNTIME_SUCCESS,
         infoMsg: MSG_NG_RUNTIME_LOG
+
     }
 
     try {
+        // Symlink to reuse the existing node_modules
         if (args.optimizeUIBuild) {
-            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');
+            // Download app-ng-runtime node modules
+            let pathNGRuntimePackage = downloadNPMPackage(packageInfo);
+            fs.symlinkSync(pathNGRuntimePackage + '/node_modules', args.appTarget + '/node_modules', 'dir');
         } else {
-            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);
+            fs.copyFileSync(packageInfo.packageJsonFile, args.appTarget + '/package.json');
+            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);