@wavemaker/angular-codegen 11.7.5-1.5782 → 11.7.5-1.5784

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

@@ -1,6 +1,6 @@
 {
-    "name": "@wavemaker/angular-app",
-    "version": "11.7.5-1.5782",
+    "name": "wavemaker-ng-runtime-new",
+    "version": "0.0.0",
     "scripts": {
         "ng": "ng",
         "start": "./node_modules/.bin/ng serve",
@@ -15,20 +15,17 @@
         "optimizecss": "gulp --gulpfile build-scripts/optimize-css.gulpfile.js",
         "owasp": "owasp-dependency-check --project \"wavemaker-ng-runtime\" -f \"ALL\""
     },
-    "files": [
-        "**/*",
-        ".npmrc"
-    ],
+    "private": true,
     "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": "16.2.12",
+        "@angular/common": "16.2.12",
+        "@angular/compiler": "16.2.12",
+        "@angular/core": "16.2.12",
+        "@angular/forms": "16.2.12",
+        "@angular/platform-browser": "16.2.12",
+        "@angular/platform-browser-dynamic": "16.2.12",
+        "@angular/router": "16.2.12",
+        "@angular/service-worker": "16.2.12",
         "@awesome-cordova-plugins/app-version": "5.39.1",
         "@awesome-cordova-plugins/barcode-scanner": "5.39.1",
         "@awesome-cordova-plugins/calendar": "5.39.1",
@@ -46,9 +43,9 @@
         "@awesome-cordova-plugins/vibration": "5.39.1",
         "@babel/runtime": "7.14.8",
         "@metrichor/jmespath": "0.3.1",
-        "@wavemaker/focus-trap": "1.0.1",
+        "@wavemaker/focus-trap": "1.0.0",
         "@wavemaker/nvd3": "1.8.11",
-        "@wavemaker/variables": "11.7.5-1.5782",
+        "@wavemaker/variables": "11.7.5-1.5784",
         "@ztree/ztree_v3": "3.5.48",
         "angular-imask": "^7.6.1",
         "angular2-websocket": "0.9.7",
@@ -56,12 +53,13 @@
         "d3": "7.8.5",
         "fullcalendar": "5.3.1",
         "hammerjs": "2.0.8",
+        "he": "1.2.0",
         "iscroll": "5.2.0",
         "jquery": "3.7.1",
-        "jquery-ui": "1.13.3",
+        "jquery-ui": "1.13.2",
         "js-cookie": "2.2.0",
         "jssha": "3.1.2",
-        "lodash-es": "4.17.21",
+        "lodash": "4.17.21",
         "ng-circle-progress": "1.7.1",
         "ngx-bootstrap": "9.0.0",
         "ngx-color-picker": "16.0.0",
@@ -72,16 +70,16 @@
         "ts-jest": "29.1.1",
         "tslib": "2.4.1",
         "x2js": "3.4.4",
-        "zone.js": "0.14.7",
-        "@wavemaker/app-ng-runtime": "11.7.5-1.5782"
+        "zone.js": "0.13.3",
+        "@wavemaker/app-ng-runtime": "11.7.5-1.5784"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "^0.27.0",
-        "@angular-builders/custom-webpack": "17.0.2",
-        "@angular-devkit/build-angular": "17.3.8",
-        "@angular/cli": "17.3.8",
-        "@angular/compiler-cli": "17.3.11",
-        "@angular/language-service": "17.3.11",
+        "@angular-builders/custom-webpack": "16.0.1",
+        "@angular-devkit/build-angular": "16.2.11",
+        "@angular/cli": "16.2.11",
+        "@angular/compiler-cli": "16.2.12",
+        "@angular/language-service": "16.2.12",
         "@babel/plugin-transform-runtime": "^7.14.5",
         "@compodoc/compodoc": "^1.1.19",
         "@rollup/plugin-alias": "4.0.2",
@@ -90,7 +88,6 @@
         "@rollup/plugin-node-resolve": "15.0.1",
         "@types/jest": "^29.5.12",
         "@types/jquery": "3.3.22",
-        "@types/lodash-es": "4.17.12",
         "@types/node": "12.11.1",
         "@types/sizzle": "^2.3.3",
         "babel-loader": "^9.1.2",
@@ -101,11 +98,10 @@
         "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",
         "moment": "2.29.4",
         "moment-timezone": "^0.5.34",
-        "ng-packagr": "17.3.0",
+        "ng-packagr": "16.2.3",
         "npm-run-all": "4.1.5",
         "owasp-dependency-check": "0.0.21",
         "rimraf": "2.6.3",
@@ -115,7 +111,7 @@
         "terser": "^5.15.1",
         "ts-node": "7.0.1",
         "tslint": "~6.1.0",
-        "typescript": "5.4.5",
+        "typescript": "4.9.5",
         "util": "0.11.1",
         "yargs": "^17.3.1"
     },

{package → angular-codegen}/angular-app/src/setup-jest.js

@@ -1,17 +1,15 @@
 import "jest-preset-angular/setup-jest";
 import { ToastrModule } from 'ngx-toastr';
 import { TestBed } from '@angular/core/testing';
-import _ from 'lodash-es';
-import 'jest-canvas-mock';
 
 // Mock global objects if necessary
 global.jQuery = require("jquery");
 global.$ = global.jQuery;
-global._ = _;
 
 
-global.moment = require("moment");
 
+global._ = require("lodash");
+global.moment = require("moment");
 class IntersectionObserver {
     constructor(callback, options) {
 
@@ -89,32 +87,3 @@ beforeEach(() => {
     },
   });
 });
-
-// jest.setup.js
-Object.defineProperty(global.HTMLMediaElement.prototype, 'load', {
-    configurable: true,
-    enumerable: true,
-    writable: true,
-    value: jest.fn(),
-});
-
-Object.defineProperty(global.HTMLMediaElement.prototype, 'play', {
-    configurable: true,
-    enumerable: true,
-    writable: true,
-    value: jest.fn().mockResolvedValue(),
-});
-
-Object.defineProperty(global.HTMLMediaElement.prototype, 'pause', {
-    configurable: true,
-    enumerable: true,
-    writable: true,
-    value: jest.fn(),
-});
-
-Object.defineProperty(global.HTMLMediaElement.prototype, 'addTextTrack', {
-    configurable: true,
-    enumerable: true,
-    writable: true,
-    value: jest.fn(),
-});

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

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

{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,42 +43,24 @@ 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 = {
-        scope: NPM_PACKAGE_SCOPE,
-        name: ANGULAR_APP_TEMPLATE_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);