@wavemaker/angular-codegen 11.8.0-rc.5663 → 11.8.0-rc.5666

{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.5666",
     "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.5663",
+        "@wavemaker/variables": "11.8.0-rc.5666",
         "@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.5663"
+        "@wavemaker/app-ng-runtime": "11.8.0-rc.5666"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "^0.27.0",
@@ -98,7 +99,6 @@
         "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",
@@ -125,5 +125,9 @@
         "node": ">=18.16.1",
         "npm": ">=9.5.1"
     },
-    "engineStrict": true
+    "engineStrict": true,
+    "files": [
+        "**/*",
+        ".npmrc"
+    ]
 }

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

@@ -2,7 +2,6 @@ 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");
@@ -11,7 +10,6 @@ global._ = _;
 
 
 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(),
-});

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

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

{angular-codegen → package}/dependencies/pipe-provider.cjs.js

@@ -145519,28 +145519,6 @@ let CustomPipeManager$1 = class CustomPipeManager {
         args: [{ providedIn: 'root' }]
     }], null, null); })();
 
-let CustomIconsLoaderService$1 = class CustomIconsLoaderService {
-    constructor() {
-        this.http = inject(HttpClient$1);
-    }
-    load() {
-        this.http.get('./font.config.js', { responseType: 'text' }).subscribe((fontConfig) => {
-            const cssPaths = [], regex = /"csspath":\s*"([^"]+)"/g;
-            let match;
-            while ((match = regex.exec(fontConfig)) !== null) {
-                cssPaths.push(match[1]);
-            }
-            loadStyleSheets$1(cssPaths);
-        }, (error) => { });
-    }
-    static { this.ɵfac = function CustomIconsLoaderService_Factory(t) { return new (t || CustomIconsLoaderService)(); }; }
-    static { this.ɵprov = /*@__PURE__*/ ɵɵdefineInjectable({ token: CustomIconsLoaderService, factory: CustomIconsLoaderService.ɵfac, providedIn: 'root' }); }
-};
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && setClassMetadata(CustomIconsLoaderService$1, [{
-        type: Injectable,
-        args: [{ providedIn: 'root' }]
-    }], null, null); })();
-
 let StatePersistence$1 = class StatePersistence {
     constructor() {
         this.HISTORY_HANDLER = 'replace';
@@ -203747,28 +203725,6 @@ class CustomPipeManager {
         args: [{ providedIn: 'root' }]
     }], null, null); })();
 
-class CustomIconsLoaderService {
-    constructor() {
-        this.http = inject$1(HttpClient);
-    }
-    load() {
-        this.http.get('./font.config.js', { responseType: 'text' }).subscribe((fontConfig) => {
-            const cssPaths = [], regex = /"csspath":\s*"([^"]+)"/g;
-            let match;
-            while ((match = regex.exec(fontConfig)) !== null) {
-                cssPaths.push(match[1]);
-            }
-            loadStyleSheets(cssPaths);
-        }, (error) => { });
-    }
-    static { this.ɵfac = function CustomIconsLoaderService_Factory(t) { return new (t || CustomIconsLoaderService)(); }; }
-    static { this.ɵprov = /*@__PURE__*/ ɵɵdefineInjectable$1({ token: CustomIconsLoaderService, factory: CustomIconsLoaderService.ɵfac, providedIn: 'root' }); }
-}
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && setClassMetadata$1(CustomIconsLoaderService, [{
-        type: Injectable$1,
-        args: [{ providedIn: 'root' }]
-    }], null, null); })();
-
 class StatePersistence {
     constructor() {
         this.HISTORY_HANDLER = 'replace';

{angular-codegen → package}/dependencies/transpilation-mobile.cjs.js

@@ -88910,28 +88910,6 @@ class CustomPipeManager {
         args: [{ providedIn: 'root' }]
     }], null, null); })();
 
-class CustomIconsLoaderService {
-    constructor() {
-        this.http = inject(HttpClient);
-    }
-    load() {
-        this.http.get('./font.config.js', { responseType: 'text' }).subscribe((fontConfig) => {
-            const cssPaths = [], regex = /"csspath":\s*"([^"]+)"/g;
-            let match;
-            while ((match = regex.exec(fontConfig)) !== null) {
-                cssPaths.push(match[1]);
-            }
-            loadStyleSheets(cssPaths);
-        }, (error) => { });
-    }
-    static { this.ɵfac = function CustomIconsLoaderService_Factory(t) { return new (t || CustomIconsLoaderService)(); }; }
-    static { this.ɵprov = /*@__PURE__*/ ɵɵdefineInjectable({ token: CustomIconsLoaderService, factory: CustomIconsLoaderService.ɵfac, providedIn: 'root' }); }
-}
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && setClassMetadata(CustomIconsLoaderService, [{
-        type: Injectable,
-        args: [{ providedIn: 'root' }]
-    }], null, null); })();
-
 class StatePersistence {
     constructor() {
         this.HISTORY_HANDLER = 'replace';

{angular-codegen → package}/dependencies/transpilation-web.cjs.js

@@ -100101,28 +100101,6 @@ class CustomPipeManager {
         args: [{ providedIn: 'root' }]
     }], null, null); })();
 
-class CustomIconsLoaderService {
-    constructor() {
-        this.http = inject(HttpClient);
-    }
-    load() {
-        this.http.get('./font.config.js', { responseType: 'text' }).subscribe((fontConfig) => {
-            const cssPaths = [], regex = /"csspath":\s*"([^"]+)"/g;
-            let match;
-            while ((match = regex.exec(fontConfig)) !== null) {
-                cssPaths.push(match[1]);
-            }
-            loadStyleSheets(cssPaths);
-        }, (error) => { });
-    }
-    static { this.ɵfac = function CustomIconsLoaderService_Factory(t) { return new (t || CustomIconsLoaderService)(); }; }
-    static { this.ɵprov = /*@__PURE__*/ ɵɵdefineInjectable({ token: CustomIconsLoaderService, factory: CustomIconsLoaderService.ɵfac, providedIn: 'root' }); }
-}
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && setClassMetadata(CustomIconsLoaderService, [{
-        type: Injectable,
-        args: [{ providedIn: 'root' }]
-    }], null, null); })();
-
 class StatePersistence {
     constructor() {
         this.HISTORY_HANDLER = 'replace';

{angular-codegen → package}/download-packages.js

@@ -41,7 +41,7 @@ const downloadNPMPackage = (packageInfo) => {
         if (packageInfo.packageJsonFile && fs.existsSync(packageInfo.packageJsonFile)) {
             fs.copyFileSync(packageInfo.packageJsonFile, PATH_NPM_PACKAGE + '/package.json');
         } else {
-            npmInstallCMD = 'npm init -y &&  ' + npmInstallCMD + packageInfo.scope + '/' + packageInfo.name + '@' + packageInfo.version;
+            npmInstallCMD = npmInstallCMD + packageInfo.scope + '/' + packageInfo.name + '@' + packageInfo.version;
         }
 
         executeSyncCmd('cd ' + PATH_NPM_PACKAGE + ' && ' + npmInstallCMD, (errMsg) => {