@wavemaker/angular-app 12.0.0-next.141221 → 12.0.0-next.47809

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-app",
-    "version": "12.0.0-next.141221",
+    "version": "12.0.0-next.47809",
     "scripts": {
         "ng": "ng",
         "start": "./node_modules/.bin/ng serve",
@@ -30,32 +30,24 @@
         "@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",
-        "@awesome-cordova-plugins/camera": "5.39.1",
-        "@awesome-cordova-plugins/core": "5.39.1",
-        "@awesome-cordova-plugins/device": "5.39.1",
-        "@awesome-cordova-plugins/diagnostic": "5.39.1",
-        "@awesome-cordova-plugins/file": "5.39.1",
-        "@awesome-cordova-plugins/file-opener": "5.39.1",
-        "@awesome-cordova-plugins/geolocation": "5.39.1",
-        "@awesome-cordova-plugins/location-accuracy": "5.39.1",
-        "@awesome-cordova-plugins/media-capture": "5.39.1",
-        "@awesome-cordova-plugins/network": "5.39.1",
-        "@awesome-cordova-plugins/sqlite": "5.39.1",
-        "@awesome-cordova-plugins/vibration": "5.39.1",
         "@babel/runtime": "7.14.8",
+        "@fullcalendar/core": "6.1.15",
+        "@fullcalendar/daygrid": "6.1.15",
+        "@fullcalendar/interaction": "6.1.15",
+        "@fullcalendar/list": "6.1.15",
+        "@fullcalendar/timegrid": "6.1.15",
         "@metrichor/jmespath": "0.3.1",
+        "@wavemaker/custom-widgets-m3": "12.0.0-next.47809",
         "@wavemaker/focus-trap": "1.0.1",
-        "@wavemaker/nvd3": "1.8.12",
-        "@wavemaker/variables": "12.0.0-next.141221",
+        "@wavemaker/foundation-css": "12.0.0-next.47809",
+        "@wavemaker/nvd3": "1.8.13",
+        "@wavemaker/variables": "12.0.0-next.47809",
         "@ztree/ztree_v3": "3.5.48",
         "angular-imask": "^7.6.1",
         "angular2-websocket": "0.9.7",
         "core-js": "3.35.1",
         "d3": "7.8.5",
-        "fullcalendar": "5.3.1",
+        "esbuild-wasm": "^0.24.2",
         "hammerjs": "2.0.8",
         "iscroll": "5.2.0",
         "jquery": "3.7.1",
@@ -75,7 +67,7 @@
         "tslib": "2.4.1",
         "x2js": "3.4.4",
         "zone.js": "0.14.10",
-        "@wavemaker/app-ng-runtime": "12.0.0-next.141221"
+        "@wavemaker/app-ng-runtime": "12.0.0-next.47809"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "^0.27.0",
@@ -95,6 +87,7 @@
         "@rollup/plugin-commonjs": "24.0.0",
         "@rollup/plugin-multi-entry": "6.0.0",
         "@rollup/plugin-node-resolve": "15.0.1",
+        "@rollup/plugin-typescript": "^8.3.3",
         "@types/jest": "^29.5.12",
         "@types/jquery": "3.3.22",
         "@types/lodash-es": "4.17.12",
@@ -102,6 +95,7 @@
         "@types/sizzle": "^2.3.3",
         "@typescript-eslint/eslint-plugin": "6.15.0",
         "@typescript-eslint/parser": "6.15.0",
+        "acorn": "8.14.0",
         "babel-loader": "^9.1.2",
         "cheerio": "1.0.0-rc.12",
         "codelyzer": "5.1.2",
@@ -115,6 +109,7 @@
         "jest-preset-angular": "^14.1.0",
         "license-checker": "25.0.1",
         "moment": "2.29.4",
+        "moment-locales-webpack-plugin": "^1.2.0",
         "moment-timezone": "^0.5.34",
         "ng-packagr": "17.3.0",
         "npm-run-all": "4.1.5",
@@ -133,11 +128,17 @@
     "optionalDependencies": {
         "@rollup/rollup-darwin-arm64": "4.9.5",
         "@rollup/rollup-linux-x64-gnu": "4.9.5",
-        "@rollup/rollup-win32-x64": "4.9.5"
+        "@rollup/rollup-win32-x64": "4.9.5",
+        "@lmdb/lmdb-linux-x64": "3.0.13"
     },
     "engines": {
         "node": "~22.11.0",
         "npm": "~10.9.0"
     },
+    "overrides": {
+        "ng-packagr": {
+            "@rollup/wasm-node": "4.40.2"
+        }
+    },
     "engineStrict": true
 }

package/src/app/lazy-load-scripts.resolve.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { isMobileApp, ScriptLoaderService } from '@wm/core';
+import {  ScriptLoaderService } from '@wm/core';
+
 
 
 @Injectable()
@@ -8,13 +9,5 @@ export class LazyLoadScriptsResolve {
     constructor(private scriptLoaderService: ScriptLoaderService) {}
 
     async resolve() {
-        const scriptsToLoad = [];
-        if(isMobileApp()) {
-            scriptsToLoad.push('node_modules-hammerjs-hammer.min.js');
-            scriptsToLoad.push('node_modules-iscroll-build-iscroll.js');
-        }
-        if (scriptsToLoad.length > 0) {
-            await this.scriptLoaderService.load(...scriptsToLoad);
-        }
     }
 }

package/src/framework/services/customwidget-config-provider.service.ts

@@ -0,0 +1,13 @@
+import { Injectable } from '@angular/core';
+
+import { CustomwidgetConfigProvider } from '@wm/runtime/base';
+
+import { getCustomWidgetConfig } from '../util/page-util';
+
+@Injectable()
+export class CustomwidgetConfigProviderService extends CustomwidgetConfigProvider {
+
+    public getConfig(widgetname: string): Promise<any> {
+        return Promise.resolve(getCustomWidgetConfig(widgetname));
+    }
+}

package/src/framework/util/page-util.ts

@@ -1,5 +1,7 @@
 const prefabConfigs = new Map<string, any>();
+const customWidgetConfigs = new Map<string, any>();
 
 export const registerPrefabConfig = (prefabName: string, config: any) => prefabConfigs.set(prefabName, config);
 export const getPrefabConfig = prefabName => prefabConfigs.get(prefabName);
-
+export const registerCustomWidgetConfig = (customWidget: string, config: any) => customWidgetConfigs.set(customWidget, config);
+export const getCustomWidgetConfig = customWidget => customWidgetConfigs.get(customWidget);

package/src/index.html

@@ -11,7 +11,7 @@
     <link rel="icon" type="image/x-icon" href="favicon.ico">
 
 </head>
-<body class="wm-app">
+<body class="wm-app"> 
     <app-root></app-root>
 </body>
 </html>

package/src/main.ts

@@ -1,20 +1,19 @@
-import { ApplicationRef, enableProdMode, NgModuleRef } from '@angular/core';
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-
-import { AppModule } from './app/app.module';
+import { ApplicationRef, enableProdMode } from '@angular/core';
+import { bootstrapApplication } from '@angular/platform-browser';
 import { environment } from './environments/environment';
-
 import initWmProjectProperties from './app/wm-project-properties';
 import { WMAppProperties } from './app/wmProperties';
 import * as fontConfig from './font.config';
+import { appConfig } from './app/app.config';
+import { AppComponent } from '@wm/runtime/base';
 
-
-let formatAcceptHeader = (languages: any) => {
-  let result: string[] = [];
-  let addedLanguages = new Set<string>(); // To track already added languages
+// Format Accept-Language header
+const formatAcceptHeader = (languages: string[]): string => {
+  const result: string[] = [];
+  const addedLanguages = new Set<string>(); // To track already added languages
   let qValue = 1.0;
 
-  languages.forEach((lang: any) => {
+  languages.forEach((lang: string) => {
     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)}`}`);
@@ -37,31 +36,26 @@ let formatAcceptHeader = (languages: any) => {
   });
 
   return result.join(',');
-}
-WMAppProperties['preferredLanguage'] = formatAcceptHeader(navigator.languages);
-WMAppProperties['fontConfig'] = fontConfig;
-
+};
 
-(window as any)._WM_APP_PROPERTIES  = WMAppProperties
+// Initialize WMAppProperties
+WMAppProperties['preferredLanguage'] = formatAcceptHeader((navigator as any).languages);
+WMAppProperties['fontConfig'] = fontConfig;
+(window as any)._WM_APP_PROPERTIES = WMAppProperties;
 initWmProjectProperties();
 
 if (environment.production) {
-    enableProdMode();
+  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));
-});
+  new Promise<Event | void>(resolve => {
+    resolve();
+  }).then(() => bootstrapApplication(AppComponent, appConfig))
+    .then((appRef: ApplicationRef) => {
+      window.addEventListener('unload', () => {
+        appRef.components.map(c => c?.destroy());
+      });
+    })
+    .catch(err => console.error('Error bootstrapping app:', err));
+});

package/src/setup-jest.js

@@ -1,9 +1,12 @@
-import "jest-preset-angular/setup-jest";
+// This file is automatically loaded when running `jest` commands
+import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';
 import { ToastrModule } from 'ngx-toastr';
 import { TestBed } from '@angular/core/testing';
 import _ from 'lodash-es';
 import 'jest-canvas-mock';
 
+setupZoneTestEnv();
+
 // Mock global objects if necessary
 global.jQuery = require("jquery");
 global.$ = global.jQuery;

package/tsconfig.json

@@ -32,15 +32,15 @@
             "@wm/build-task": [
                 "node_modules/@wavemaker/app-ng-runtime/build-task/"
             ],
-            "@wm/mobile-build-task": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile-build-task"
-            ],
             "@wm/core": [
                 "node_modules/@wavemaker/app-ng-runtime/core"
             ],
             "@wavemaker/variables": [
                 "node_modules/@wavemaker/variables/"
             ],
+            "@wavemaker/custom-widgets-m3": [
+                "node_modules/@wavemaker/custom-widgets-m3/"
+            ],
             "@wm/components/base": [
                 "node_modules/@wavemaker/app-ng-runtime/components/base"
             ],
@@ -53,18 +53,9 @@
             "@wm/components/page": [
                 "node_modules/@wavemaker/app-ng-runtime/components/page/default"
             ],
-            "@wm/mobile/components/basic": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/components/basic/default"
-            ],
-            "@wm/mobile/components/page": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/components/page/default"
-            ],
             "@wm/components/dialogs": [
                 "node_modules/@wavemaker/app-ng-runtime/components/dialogs/default"
             ],
-            "@wm/mobile/components/*": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/components/*"
-            ],
             "@wm/components/*": [
                 "node_modules/@wavemaker/app-ng-runtime/components/*"
             ],
@@ -86,29 +77,11 @@
             "@wm/variables": [
                 "node_modules/@wavemaker/app-ng-runtime/variables"
             ],
-            "@wm/mobile/core": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/core"
-            ],
-            "@wm/mobile/components": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/components"
-            ],
-            "@wm/mobile/offline": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/offline"
-            ],
-            "@wm/mobile/variables": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/variables"
-            ],
             "@wm/runtime/base": [
                 "node_modules/@wavemaker/app-ng-runtime/runtime/base"
             ],
             "@wm/runtime/dynamic": [
                 "node_modules/@wavemaker/app-ng-runtime/runtime/dynamic"
-            ],
-            "@wm/mobile/runtime": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/runtime"
-            ],
-            "@wm/mobile/runtime/dynamic": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/runtime-dynamic"
             ]
         },
         "useDefineForClassFields": false

package/tsconfig.web-app.json

@@ -31,9 +31,6 @@
             "@wm/build-task": [
                 "node_modules/@wavemaker/app-ng-runtime/build-task/"
             ],
-            "@wm/mobile-build-task": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile-build-task"
-            ],
             "@wm/core": [
                 "node_modules/@wavemaker/app-ng-runtime/core"
             ],
@@ -70,29 +67,11 @@
             "@wm/variables": [
                 "node_modules/@wavemaker/app-ng-runtime/variables"
             ],
-            "@wm/mobile/core": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/core"
-            ],
-            "@wm/mobile/components": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/components"
-            ],
-            "@wm/mobile/offline": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/offline"
-            ],
-            "@wm/mobile/variables": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/variables"
-            ],
             "@wm/runtime/base": [
                 "node_modules/@wavemaker/app-ng-runtime/runtime/base"
             ],
             "@wm/runtime/dynamic": [
                 "node_modules/@wavemaker/app-ng-runtime/runtime/dynamic"
-            ],
-            "@wm/mobile/runtime": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/placeholder/runtime"
-            ],
-            "@wm/mobile/runtime-dynamic": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/placeholder/runtime/dynamic"
             ]
         }
     },

package/wm-custom-webpack.config.js

@@ -2,6 +2,18 @@ const CompressionPlugin = require(`compression-webpack-plugin`);
 const path = require(`path`);
 const {ConcatSource} = require("webpack-sources");
 
+const MomentLocalesPlugin = require('moment-locales-webpack-plugin');
+
+const wmPropertiesPath = path.join(__dirname, '/src/app/wmProperties.js');
+
+const { WMAppProperties } = require(wmPropertiesPath);
+
+const localesToKeep = Object.values(WMAppProperties.supportedLanguages)
+  .map(lang => lang.moment)
+  .filter(locale => locale !== null);
+
+  const includeMomentPlugin = WMAppProperties.languageBundleSources === "STATIC";
+
 class ModifyCssAssetUrlsPlugin {
     apply(compiler) {
         compiler.hooks.compilation.tap('ModifyCssAssetUrlsPlugin', compilation => {
@@ -78,6 +90,12 @@ module.exports = {
             filename: "[name].br[ext]",
             algorithm: "brotliCompress"
         }),
+        // On STATIC WMAppProperties.languageBundleSources, required moment locales are included in the bundle
+        
+        /**
+         * MomentLocalesPlugin is used to include only the required moment locales in the bundle.
+         */
+        ...(includeMomentPlugin ? [ new MomentLocalesPlugin({ localesToKeep }) ] : [])
     ],
     optimization: {
         splitChunks: {