@wavemaker/angular-codegen 11.9.5-rc.6003 → 11.10.0-next.140547

{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.10.0-next.140547",
     "scripts": {
         "ng": "ng",
         "start": "./node_modules/.bin/ng serve",
@@ -12,20 +12,24 @@
         "test-prod": "jest --no-cache --no-color --ci --silent 2>&1 | sed 's/\\x1b\\[[0-9;]*m//g' > karma-test-report.txt",
         "lint": "eslint src/",
         "e2e": "./node_modules/.bin/ng e2e",
+        "generate-deps": "node generate-dependency-report.js",
         "optimizecss": "gulp --gulpfile build-scripts/optimize-css.gulpfile.js",
         "owasp": "owasp-dependency-check --project \"wavemaker-ng-runtime\" -f \"ALL\""
     },
-    "private": true,
+    "files": [
+        "**/*",
+        ".npmrc"
+    ],
     "dependencies": {
-        "@angular/animations": "17.3.11",
-        "@angular/common": "17.3.11",
-        "@angular/compiler": "17.3.11",
-        "@angular/core": "17.3.11",
-        "@angular/forms": "17.3.11",
-        "@angular/platform-browser": "17.3.11",
-        "@angular/platform-browser-dynamic": "17.3.11",
-        "@angular/router": "17.3.11",
-        "@angular/service-worker": "17.3.11",
+        "@angular/animations": "18.2.13",
+        "@angular/common": "18.2.13",
+        "@angular/compiler": "18.2.13",
+        "@angular/core": "18.2.13",
+        "@angular/forms": "18.2.13",
+        "@angular/platform-browser": "18.2.13",
+        "@angular/platform-browser-dynamic": "18.2.13",
+        "@angular/router": "18.2.13",
+        "@angular/service-worker": "18.2.13",
         "@awesome-cordova-plugins/app-version": "5.39.1",
         "@awesome-cordova-plugins/barcode-scanner": "5.39.1",
         "@awesome-cordova-plugins/calendar": "5.39.1",
@@ -45,7 +49,7 @@
         "@metrichor/jmespath": "0.3.1",
         "@wavemaker/focus-trap": "1.0.1",
         "@wavemaker/nvd3": "1.8.12",
-        "@wavemaker/variables": "11.9.5-rc.6003",
+        "@wavemaker/variables": "11.10.0-next.140547",
         "@ztree/ztree_v3": "3.5.48",
         "angular-imask": "^7.6.1",
         "angular2-websocket": "0.9.7",
@@ -58,6 +62,7 @@
         "jquery-ui": "1.13.3",
         "js-cookie": "2.2.0",
         "jssha": "3.1.2",
+        "lodash": "4.17.21",
         "lodash-es": "4.17.21",
         "ng-circle-progress": "1.7.1",
         "ngx-bootstrap": "9.0.0",
@@ -65,25 +70,25 @@
         "ngx-toastr": "17.0.2",
         "rxjs": "6.6.0",
         "rxjs-compat": "6.4.0",
-        "summernote": "0.8.20",
+        "summernote": "0.9.1",
         "ts-jest": "29.1.1",
         "tslib": "2.4.1",
         "x2js": "3.4.4",
-        "zone.js": "0.14.7",
-        "@wavemaker/app-ng-runtime": "11.9.5-rc.6003"
+        "zone.js": "0.14.10",
+        "@wavemaker/app-ng-runtime": "11.10.0-next.140547"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "^0.27.0",
-        "@angular-builders/custom-webpack": "17.0.2",
-        "@angular-devkit/build-angular": "17.3.8",
+        "@angular-builders/custom-webpack": "18.0.0",
+        "@angular-devkit/build-angular": "18.2.12",
         "@angular-eslint/builder": "16.2.0",
         "@angular-eslint/eslint-plugin": "16.2.0",
         "@angular-eslint/eslint-plugin-template": "16.2.0",
         "@angular-eslint/schematics": "16.2.0",
         "@angular-eslint/template-parser": "16.2.0",
-        "@angular/cli": "17.3.8",
-        "@angular/compiler-cli": "17.3.11",
-        "@angular/language-service": "17.3.11",
+        "@angular/cli": "18.2.12",
+        "@angular/compiler-cli": "18.2.13",
+        "@angular/language-service": "18.2.13",
         "@babel/plugin-transform-runtime": "^7.14.5",
         "@compodoc/compodoc": "^1.1.25",
         "@rollup/plugin-alias": "4.0.2",
@@ -101,21 +106,23 @@
         "cheerio": "1.0.0-rc.12",
         "codelyzer": "5.1.2",
         "compression-webpack-plugin": "10.0.0",
+        "dependency-cruiser": "16.8.0",
         "eslint": "^8.45.0",
         "fs": "0.0.1-security",
         "fs-extra": "7.0.1",
         "jest": "^29.7.0",
         "jest-canvas-mock": "^2.5.2",
         "jest-preset-angular": "^14.1.0",
+        "license-checker": "25.0.1",
         "moment": "2.29.4",
         "moment-timezone": "^0.5.34",
         "ng-packagr": "17.3.0",
         "npm-run-all": "4.1.5",
         "owasp-dependency-check": "0.0.23",
         "rimraf": "2.6.3",
-        "rollup": "4.9.5",
+        "rollup": "4.28.1",
         "rollup-plugin-includepaths": "0.2.3",
-        "sonarqube-scanner": "4.0.1",
+        "sonarqube-scanner": "4.2.6",
         "terser": "^5.15.1",
         "ts-node": "7.0.1",
         "tslint": "~6.1.0",
@@ -129,8 +136,8 @@
         "@rollup/rollup-win32-x64": "4.9.5"
     },
     "engines": {
-        "node": ">=18.16.1",
-        "npm": ">=9.5.1"
+        "node": "~22.11.0",
+        "npm": "~10.9.0"
     },
     "engineStrict": true
 }

package/angular-app/src/main.ts

@@ -0,0 +1,67 @@
+import { ApplicationRef, enableProdMode, NgModuleRef } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app/app.module';
+import { environment } from './environments/environment';
+
+import initWmProjectProperties from './app/wm-project-properties';
+import { WMAppProperties } from './app/wmProperties';
+import * as fontConfig from './font.config';
+
+
+let formatAcceptHeader = (languages: any) => {
+  let result: string[] = [];
+  let addedLanguages = new Set<string>(); // To track already added languages
+  let qValue = 1.0;
+
+  languages.forEach((lang: any) => {
+    if (!addedLanguages.has(lang)) {
+      // Add the full language (e.g., en-US or en) if not already added
+      result.push(`${lang}${qValue === 1.0 ? '' : `;q=${qValue.toFixed(1)}`}`);
+      addedLanguages.add(lang);
+      // Decrease qValue for the next language
+      qValue = Math.max(0.1, qValue - 0.1); // Decrease qValue, minimum is 0.1
+    }
+
+    // If language has a region code (e.g., en-US), also add the base language (e.g., en)
+    if (lang.includes('-')) {
+      const baseLang = lang.split('-')[0];
+      if (!addedLanguages.has(baseLang)) {
+        result.push(`${baseLang};q=${qValue.toFixed(1)}`);
+        addedLanguages.add(baseLang);
+
+        // Decrease qValue for the next language
+        qValue = Math.max(0.1, qValue - 0.1);
+      }
+    }
+  });
+
+  return result.join(',');
+}
+WMAppProperties['preferredLanguage'] = formatAcceptHeader(navigator.languages);
+WMAppProperties['fontConfig'] = fontConfig;
+
+
+(window as any)._WM_APP_PROPERTIES  = WMAppProperties
+initWmProjectProperties();
+
+if (environment.production) {
+    enableProdMode();
+}
+
+document.addEventListener('DOMContentLoaded', () => {
+    new Promise<Event | void>( resolve => {
+        if (window['cordova']) {
+            document.addEventListener('deviceready', resolve);
+        } else {
+            resolve();
+        }
+    }).then(() => platformBrowserDynamic().bootstrapModule(AppModule))
+        .then((appModuleRef: NgModuleRef<AppModule>) => {
+            const applicationRef = appModuleRef.injector.get(ApplicationRef);
+            window.addEventListener('unload', () => {
+                applicationRef.components.map(c => c && c.destroy());
+            });
+            console.timeEnd('bootstrap'), err => console.log(err);
+        }, err => console.log(err));
+});

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

@@ -17,6 +17,9 @@ const { downloadNPMPackage } = require('./download-packages');
 const archiver = require('archiver');
 const path = require("path");
 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.
@@ -44,24 +47,42 @@ const updateDeployUrl = (args) => {
  * Run the ng build and post build for the project
  */
 const buildAngularApp = (args) => {
+    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 = {
-        name: 'app-ng-runtime',
+        scope: NPM_PACKAGE_SCOPE,
+        name: ANGULAR_APP_TEMPLATE_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 --prefix ' + TARBALL_DOWNLOAD_PATH, 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);