@wavemaker/angular-codegen 12.0.0-next.1417157 → 12.0.0-next.1417163

angular-codegen/angular-app/angular.json

@@ -28,6 +28,7 @@
             "tsConfig": "src/tsconfig.app.json",
             "assets": [
               "src/favicon.ico",
+              "src/favicon.png",
               "src/assets",
               {
                   "glob": "print.css",
@@ -193,6 +194,7 @@
             "tsConfig": "src/tsconfig.app.json",
             "assets": [
               "src/favicon.ico",
+              "src/favicon.png",
               "src/assets",
               {
                   "glob": "print.css",

angular-codegen/angular-app/build-scripts/post-build.js

@@ -294,6 +294,8 @@ const generateSha1 = (content) => {
 
         //this is required to download all the assets
         $('head').append(`<meta name="deployUrl" content=${deployUrl} />`);
+        $('script[src$="services/application/wmProperties.js"]').remove();
+        $('link[href$="favicon.png"]').attr('href', './ng-bundle/favicon.png');
 
         const htmlContent = $.html();
         await writeFile(`./dist/index.html`, htmlContent);

angular-codegen/angular-app/package-lock.json

@@ -36,7 +36,7 @@
                 "@metrichor/jmespath": "0.3.1",
                 "@wavemaker/focus-trap": "1.0.1",
                 "@wavemaker/nvd3": "1.8.12",
-                "@wavemaker/variables": "12.0.0-next.1417157",
+                "@wavemaker/variables": "12.0.0-next.1417163",
                 "@ztree/ztree_v3": "3.5.48",
                 "angular-imask": "^7.6.1",
                 "angular2-websocket": "0.9.7",
@@ -7577,9 +7577,9 @@
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "12.0.0-next.1417157",
-            "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-12.0.0-next.1417157.tgz",
-            "integrity": "sha512-nEQbJQJhXhHdcUOz5c9ew+Qj6TquoVPtUn12Trpm/ZJcsq7I4cKEwGnpalXKLK2ZL5sXe3kXT+rx6mMZ5zCQzg==",
+            "version": "12.0.0-next.1417163",
+            "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-12.0.0-next.1417163.tgz",
+            "integrity": "sha512-tpft6hqpFmj+kd9JKYt9+YWPjdVip0vIpgM5i5imQvDTgAqleuFmtsdVSRdVsXgdFm68tQMiXr68dHyTOy2LWQ==",
             "dependencies": {
                 "@metrichor/jmespath": "^0.3.1",
                 "he": "^1.2.0",

angular-codegen/angular-app/package.json

@@ -45,7 +45,7 @@
         "@metrichor/jmespath": "0.3.1",
         "@wavemaker/focus-trap": "1.0.1",
         "@wavemaker/nvd3": "1.8.12",
-        "@wavemaker/variables": "12.0.0-next.1417157",
+        "@wavemaker/variables": "12.0.0-next.1417163",
         "@ztree/ztree_v3": "3.5.48",
         "angular-imask": "^7.6.1",
         "angular2-websocket": "0.9.7",
@@ -70,7 +70,7 @@
         "tslib": "2.4.1",
         "x2js": "3.4.4",
         "zone.js": "0.14.7",
-        "@wavemaker/app-ng-runtime": "12.0.0-next.1417157"
+        "@wavemaker/app-ng-runtime": "12.0.0-next.1417163"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "^0.27.0",

angular-codegen/angular-app/src/main.ts

@@ -39,41 +39,9 @@ let formatAcceptHeader = (languages: any) => {
   return result.join(',');
 }
 WMAppProperties['preferredLanguage'] = formatAcceptHeader(navigator.languages);
-WMAppProperties[fontConfig] = fontConfig;
+WMAppProperties['fontConfig'] = fontConfig;
 
 
-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);
-
 (window as any)._WM_APP_PROPERTIES  = WMAppProperties
 initWmProjectProperties();
 

angular-codegen/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "12.0.0-next.1417157",
+    "version": "12.0.0-next.1417163",
     "description": "",
     "main": "index.js",
     "scripts": {

angular-codegen/src/update-angular-json.js

@@ -1 +1 @@
-const cheerio=require("cheerio"),{writeFile:writeFile,readFileSync:readFileSync,readDir:readDir,isMobileProject:isMobileProject}=require("./wm-utils"),markScriptsAsLazy=e=>{const s=["./node_modules/d3/dist/d3.min.js","./node_modules/@wavemaker/nvd3/build/nv.d3.min.js","./node_modules/fullcalendar/main.min.js","./node_modules/summernote/dist/summernote-lite.min.js",global._WM_PACKAGE_PATH+"/scripts/datatable/datatable.js","./node_modules/jquery-ui/ui/widgets/sortable.js","./node_modules/jquery-ui/ui/widgets/droppable.js","./node_modules/jquery-ui/ui/widgets/resizable.js","./node_modules/hammerjs/hammer.min.js","./node_modules/iscroll/build/iscroll.js"];let t=e.replace(/^(\.\/)/,"").replace(/\//g,"-").replace(/@/g,"");return t=t.substring(0,t.lastIndexOf(".")),t+="-NOHASH",s.includes(e)?{input:e,inject:!1,bundleName:t}:e},setBuildCustomizations=async e=>{const s=e.projects["angular-app"].architect.build,t=s.options.scripts;s.options.scripts=t.map(e=>markScriptsAsLazy(e))},addToScripts=async(e,s,t=[],i=[])=>{const n=`${s}/angular.json`;let o=readFileSync(n,!0);const a=o.projects["angular-app"].architect.build;let r=a.options.scripts;const l=`${s+"/src/app/extensions"}`,c=await readDir(l);c.length&&i.push("./src/app/extensions/"+c[0]),a.options.scripts=[...t,...r,...i],await writeFile(n,JSON.stringify(o,null,4))},updateAngularJSON=async(e,s,t,i,n,o,a,r,l,c)=>{const d=`${s}/angular.json`;let u=readFileSync(d,!0);const p=u.projects["angular-app"].architect.build;a&&a.trim().length>0&&(p.options.deployUrl=a);const m=p.options.styles;if(isMobileProject(t)){const e=m.findIndex(e=>{let s="object"==typeof e;if(s){return(s?e.input:e).includes("themes")}return!1}),s=m[e].input;m[e].bundleName="wm-android-styles",m[e].input=m[e].input.replace(new RegExp("/[a-z]*/style.css$"),`/${i.activeTheme}/android/style.css`);const t=Object.assign({},m[e]);t.input=s.replace(new RegExp("/[a-z]*/style.css$"),`/${i.activeTheme}/ios/style.css`),t.bundleName="wm-ios-styles",m.push(t);const n=m.findIndex(e=>{let s="object"==typeof e;if(s){return"src/assets/app.css"===(s?e.input:e)}return!1});m[n].bundleName="wm-android-styles";const o=Object.assign({},m[n]);o.bundleName="wm-ios-styles",m.push(o)}m.forEach((e,s)=>{let t="object"==typeof e,n=t?e.input:e;!n.includes("themes")||n.includes("/android/")||n.includes("/ios/")||(t?m[s].input=n.replace(new RegExp("/[a-z]*/style.css$"),`/${i.activeTheme}/style.css`):m[s]=n.replace(new RegExp("/[a-z]*/style.css$"),`/${i.activeTheme}/style.css`))}),await setBuildCustomizations(u);const g=p.configurations.production;if(g.aot=!1!==r.aot,g.buildOptimizer=!1!==r.buildOptimizer,c){const e=p.options.assets;e.push("src/manifest.json"),e.push("src/wmsw-worker.js"),g.serviceWorker=!0,g.ngswConfigPath="ngsw-config.json",delete p.options.customWebpackConfig}await writeFile(d,JSON.stringify(u,null,4))};module.exports={updateAngularJSON:updateAngularJSON,addToScripts:addToScripts};
+const cheerio=require("cheerio"),{writeFile:writeFile,readFileSync:readFileSync,readDir:readDir,isMobileProject:isMobileProject}=require("./wm-utils"),markScriptsAsLazy=e=>{const s=["./node_modules/d3/dist/d3.min.js","./node_modules/@wavemaker/nvd3/build/nv.d3.min.js","./node_modules/fullcalendar/main.min.js","./node_modules/summernote/dist/summernote-lite.min.js",global._WM_PACKAGE_PATH+"/scripts/datatable/datatable.js","./node_modules/jquery-ui/ui/widgets/sortable.js","./node_modules/jquery-ui/ui/widgets/droppable.js","./node_modules/jquery-ui/ui/widgets/resizable.js","./node_modules/hammerjs/hammer.min.js","./node_modules/iscroll/build/iscroll.js"];if("string"==typeof e){let t=e.replace(/^(\.\/)/,"").replace(/\//g,"-").replace(/@/g,"");if(t=t.substring(0,t.lastIndexOf(".")),t+="-NOHASH",s.includes(e))return{input:e,inject:!1,bundleName:t}}return e},setBuildCustomizations=async e=>{const s=e.projects["angular-app"].architect.build,t=s.options.scripts;s.options.scripts=t.map(e=>markScriptsAsLazy(e))},addToScripts=async(e,s,t=[],i=[])=>{const n=`${s}/angular.json`;let o=readFileSync(n,!0);const r=o.projects["angular-app"].architect.build;let a=r.options.scripts;const l=`${s+"/src/app/extensions"}`,c=await readDir(l);c.length&&i.push("./src/app/extensions/"+c[0]),r.options.scripts=[...t,...a,...i],await writeFile(n,JSON.stringify(o,null,4))},updateAngularJSON=async(e,s,t,i,n,o,r,a,l,c)=>{const d=`${s}/angular.json`;let u=readFileSync(d,!0);const p=u.projects["angular-app"].architect.build;r&&r.trim().length>0&&(p.options.deployUrl=r);const m=p.options.styles;if(isMobileProject(t)){const e=m.findIndex(e=>{let s="object"==typeof e;if(s){return(s?e.input:e).includes("themes")}return!1}),s=m[e].input;m[e].bundleName="wm-android-styles",m[e].input=m[e].input.replace(new RegExp("/[a-z]*/style.css$"),`/${i.activeTheme}/android/style.css`);const t=Object.assign({},m[e]);t.input=s.replace(new RegExp("/[a-z]*/style.css$"),`/${i.activeTheme}/ios/style.css`),t.bundleName="wm-ios-styles",m.push(t);const n=m.findIndex(e=>{let s="object"==typeof e;if(s){return"src/assets/app.css"===(s?e.input:e)}return!1});m[n].bundleName="wm-android-styles";const o=Object.assign({},m[n]);o.bundleName="wm-ios-styles",m.push(o)}m.forEach((e,s)=>{let t="object"==typeof e,n=t?e.input:e;!n.includes("themes")||n.includes("/android/")||n.includes("/ios/")||(t?m[s].input=n.replace(new RegExp("/[a-z]*/style.css$"),`/${i.activeTheme}/style.css`):m[s]=n.replace(new RegExp("/[a-z]*/style.css$"),`/${i.activeTheme}/style.css`))}),await setBuildCustomizations(u);const g=p.configurations.production;if(g.aot=!1!==a.aot,g.buildOptimizer=!1!==a.buildOptimizer,c){const e=p.options.assets;e.push("src/manifest.json"),e.push("src/wmsw-worker.js"),g.serviceWorker=!0,g.ngswConfigPath="ngsw-config.json",delete p.options.customWebpackConfig}await writeFile(d,JSON.stringify(u,null,4))};module.exports={updateAngularJSON:updateAngularJSON,addToScripts:addToScripts};