@wavemaker/angular-codegen 11.7.0-next.26331 → 11.7.0-next.26333

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

@@ -4,11 +4,11 @@ const path = require('path');
 let processArgs = process.argv;
 if (processArgs.findIndex(arg => arg.startsWith('--max-old-space-size')) !== -1) {
     process.env.NODE_OPTIONS = processArgs.pop();
+    console.log("Setting node options: ", process.env.NODE_OPTIONS);
 }
 const args = processArgs.slice(2);
 const ngBuildArgs = ['build', ...args];
-console.log("Build params - ", ngBuildArgs);
-console.log("Setting node options - ", process.env.NODE_OPTIONS);
+console.log("\x1b[33m", "Angular build params: ", ngBuildArgs);
 
 //Trigger angular build with the passed params
 const ngPath = path.resolve(process.cwd(), 'node_modules', '.bin', "ng");

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

@@ -36,7 +36,7 @@
                 "@metrichor/jmespath": "^0.3.1",
                 "@wavemaker/focus-trap": "^1.0.0",
                 "@wavemaker/nvd3": "1.8.11",
-                "@wavemaker/variables": "11.7.0-next.26331",
+                "@wavemaker/variables": "11.7.0-next.26333",
                 "@ztree/ztree_v3": "^3.5.48",
                 "angular-imask": "7.4.0",
                 "angular2-websocket": "0.9.7",
@@ -55,7 +55,6 @@
                 "ngx-bootstrap": "9.0.0",
                 "ngx-color-picker": "16.0.0",
                 "ngx-toastr": "17.0.2",
-                "nvd3": "^1.8.6",
                 "rxjs": "6.6.0",
                 "rxjs-compat": "6.4.0",
                 "summernote": "0.8.18",
@@ -5690,9 +5689,9 @@
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "11.7.0-next.26331",
-            "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-11.7.0-next.26331.tgz",
-            "integrity": "sha512-kBvQzaKrE0/Xj5H4spd3HSgVS2nWDCA9vgWdCas6Bw7BpAx73ggtw4V/XnWIO/GEIkl6B3p6fNRlmqyBcmWsoA==",
+            "version": "11.7.0-next.26333",
+            "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-11.7.0-next.26333.tgz",
+            "integrity": "sha512-j7WxB+x2iSvY1K9lAMsDnGolJz1LBsTaoLGk7sBsy6YHPLkRX/WlhgdvXFHg1AOlXwY4GDw5IQm5qXhYgjIMMQ==",
             "dependencies": {
                 "@metrichor/jmespath": "^0.3.1",
                 "he": "^1.2.0",
@@ -17642,14 +17641,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/nvd3": {
-            "version": "1.8.6",
-            "resolved": "https://registry.npmjs.org/nvd3/-/nvd3-1.8.6.tgz",
-            "integrity": "sha512-YGQ9hAQHuQCF0JmYkT2GhNMHb5pA+vDfQj6C2GdpQPzdRPj/srPG3mh/3fZzUFt+at1NusLk/RqICUWkxm4viQ==",
-            "peerDependencies": {
-                "d3": "^3.4.4"
-            }
-        },
         "node_modules/nwsapi": {
             "version": "2.2.7",
             "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",

angular-codegen/angular-app/package.json

@@ -47,7 +47,7 @@
         "@metrichor/jmespath": "^0.3.1",
         "@wavemaker/focus-trap": "^1.0.0",
         "@wavemaker/nvd3": "1.8.11",
-        "@wavemaker/variables": "11.7.0-next.26331",
+        "@wavemaker/variables": "11.7.0-next.26333",
         "@ztree/ztree_v3": "^3.5.48",
         "angular-imask": "7.4.0",
         "angular2-websocket": "0.9.7",
@@ -66,14 +66,13 @@
         "ngx-bootstrap": "9.0.0",
         "ngx-color-picker": "16.0.0",
         "ngx-toastr": "17.0.2",
-        "nvd3": "^1.8.6",
         "rxjs": "6.6.0",
         "rxjs-compat": "6.4.0",
         "summernote": "0.8.18",
         "tslib": "2.4.1",
         "x2js": "^3.4.4",
         "zone.js": "~0.13.3",
-        "@wavemaker/app-ng-runtime": "11.7.0-next.26331"
+        "@wavemaker/app-ng-runtime": "11.7.0-next.26333"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "^0.27.0",

angular-codegen/angular-app/wm-custom-webpack.config.js

@@ -1,5 +1,64 @@
 const CompressionPlugin = require(`compression-webpack-plugin`);
 const path = require(`path`);
+const {ConcatSource} = require("webpack-sources");
+
+class ModifyCssAssetUrlsPlugin {
+    apply(compiler) {
+        compiler.hooks.compilation.tap('ModifyCssAssetUrlsPlugin', compilation => {
+            compilation.hooks.optimizeAssets.tapAsync('ModifyCssAssetUrlsPlugin', (assets, callback) => {
+                let publicPath = compilation.options.output.publicPath;
+                let isResourceWithDeployUrl = false;
+                for (const assetName in assets) {
+                    if (!assets.hasOwnProperty(assetName)) continue;
+
+                    const asset = assets[assetName];
+                    if (asset.sourceAndMap) {
+                        const sourceAndMap = asset.sourceAndMap();
+                        let updatedSource = sourceAndMap.source;
+                        // Handle potential non-string source (e.g., convert to string)
+                        if (typeof updatedSource !== 'string') {
+                            updatedSource = updatedSource.toString('utf-8');
+                        }
+                        let modifiedSource = updatedSource.replace(/url\((.*?)\)/g, (match, url) => {
+                            isResourceWithDeployUrl = true;
+
+                            let qUrl = url.slice(1, -1);
+
+                            if (!qUrl.startsWith(publicPath)) {
+                                return match;
+                            } else {
+                                const newUrl = this.modifyUrl(publicPath, qUrl);
+                                let urlString = `url('${newUrl}')`;
+                                return urlString;
+                            }
+
+                        });
+                        if (isResourceWithDeployUrl) {
+                            isResourceWithDeployUrl = false;
+                            assets[assetName] = new ConcatSource(modifiedSource);
+                        }
+                    }
+                }
+                callback(null, assets);
+            });
+        });
+    }
+
+    modifyUrl(publicPath, url) {
+        let qUrl = url;
+        let resourceName = qUrl;
+        try {
+            const parsedUrl = new URL(qUrl);
+            resourceName = parsedUrl.pathname.split('/').pop();
+        } catch (e) {
+            //this is relative url
+            let parts = qUrl.split('/');
+            resourceName = parts[parts.length - 1];
+        }
+        let newUrl = `ng-bundle/${resourceName}`;
+        return newUrl;
+    }
+};
 
 module.exports = {
     resolve:{
@@ -8,6 +67,7 @@ module.exports = {
         }
     },
     plugins:[
+        new ModifyCssAssetUrlsPlugin(),
         new CompressionPlugin({
             test: /\.(js|css|html|svg|txt|eot|otf|ttf|gif)$/,
             filename: "[name].gzip[ext]",

angular-codegen/build-angular-app.js

@@ -25,9 +25,16 @@ const updateDeployUrl = (args) => {
     const deployParam = buildArgs.find(i => i.startsWith("--deploy-url="));
     if(!deployParam) {
         buildArgs.push("--deploy-url=ng-bundle/");
+    } else {
+        buildArgs.filter((param, index) => {
+            if (param.includes('--deploy-url=_cdnUrl_')) {
+                buildArgs[index] = "--deploy-url=_cdnUrl_/ng-bundle/"
+                return true;
+            }
+        });
     }
     buildArgs.push(args.nodeVMArgs);
-    return ngBuildParams = buildArgs.join(" ");
+    return buildArgs.join(" ");
 };
 
 /**

angular-codegen/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.7.0-next.26331",
+    "version": "11.7.0-next.26333",
     "description": "",
     "main": "index.js",
     "scripts": {