@wavemaker/angular-codegen 11.8.0-next.1417112 → 11.8.0-next.141712

{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-next.141712",
     "scripts": {
         "ng": "ng",
         "start": "./node_modules/.bin/ng serve",
@@ -15,7 +15,10 @@
         "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",
@@ -43,9 +46,9 @@
         "@awesome-cordova-plugins/vibration": "5.39.1",
         "@babel/runtime": "7.14.8",
         "@metrichor/jmespath": "0.3.1",
-        "@wavemaker/focus-trap": "1.0.0",
+        "@wavemaker/focus-trap": "1.0.1",
         "@wavemaker/nvd3": "1.8.11",
-        "@wavemaker/variables": "11.8.0-next.1417112",
+        "@wavemaker/variables": "11.8.0-next.141712",
         "@ztree/ztree_v3": "3.5.48",
         "angular-imask": "^7.6.1",
         "angular2-websocket": "0.9.7",
@@ -53,13 +56,12 @@
         "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.2",
+        "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",
         "ngx-color-picker": "16.0.0",
@@ -71,7 +73,7 @@
         "tslib": "2.4.1",
         "x2js": "3.4.4",
         "zone.js": "0.14.7",
-        "@wavemaker/app-ng-runtime": "11.8.0-next.1417112"
+        "@wavemaker/app-ng-runtime": "11.8.0-next.141712"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "^0.27.0",
@@ -88,6 +90,7 @@
         "@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",
@@ -98,6 +101,7 @@
         "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",

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

@@ -1,15 +1,17 @@
 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._ = require("lodash");
 global.moment = require("moment");
+
 class IntersectionObserver {
     constructor(callback, options) {
 
@@ -87,3 +89,32 @@ 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(),
+});

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

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

{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,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 ', 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);