@wavemaker/angular-codegen 11.7.0-rc.5528 → 11.7.5-rc.5532

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/dependencies/transpilation-mobile.cjs.js

@@ -67841,11 +67841,21 @@ var iframe_build$1 = /*#__PURE__*/Object.freeze({
     default: iframe_build
 });
 
-const tagName$1v = 'label';
+let tagName$1v = 'p';
 const idGen$p = new IDGenerator('wm_label');
 register('wm-label', () => {
     return {
         pre: (attrs) => {
+            if (!attrs.get("notag")) {
+                if (!attrs.get('type')) {
+                    const classList = attrs.get('class') ? attrs.get('class').split(' ').filter(element => ["h1", "h2", "h3", "h4", "h5", "h6", "p"].includes(element)) : [];
+                    attrs.set('type', classList.length ? classList[0] : "p");
+                }
+                tagName$1v = attrs.get('type');
+            }
+            else {
+                tagName$1v = 'label';
+            }
             const counter = idGen$p.nextUid();
             return `<${tagName$1v} wmLabel #${counter}="wmLabel" [attr.aria-label]="${counter}.hint" ${getAttrMarkup(attrs)}>`;
         },

angular-codegen/dependencies/transpilation-web.cjs.js

@@ -67841,11 +67841,21 @@ var iframe_build$1 = /*#__PURE__*/Object.freeze({
     default: iframe_build
 });
 
-const tagName$1v = 'label';
+let tagName$1v = 'p';
 const idGen$p = new IDGenerator('wm_label');
 register('wm-label', () => {
     return {
         pre: (attrs) => {
+            if (!attrs.get("notag")) {
+                if (!attrs.get('type')) {
+                    const classList = attrs.get('class') ? attrs.get('class').split(' ').filter(element => ["h1", "h2", "h3", "h4", "h5", "h6", "p"].includes(element)) : [];
+                    attrs.set('type', classList.length ? classList[0] : "p");
+                }
+                tagName$1v = attrs.get('type');
+            }
+            else {
+                tagName$1v = 'label';
+            }
             const counter = idGen$p.nextUid();
             return `<${tagName$1v} wmLabel #${counter}="wmLabel" [attr.aria-label]="${counter}.hint" ${getAttrMarkup(attrs)}>`;
         },

angular-codegen/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.7.0-rc.5528",
+    "version": "11.7.5-rc.5532",
     "description": "",
     "main": "index.js",
     "scripts": {