@wavemaker/angular-codegen 11.7.0-rc.5592 → 11.7.1-next.141118

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

@@ -20,13 +20,21 @@ const { executeSyncCmd,  MSG_NG_RUNTIME_LOG, MSG_NG_RUNTIME_SUCCESS } = require(
 /**
  * @TODO: This is a temporary workaround to extract deploy-url from 'ngBuildParams', need to be replaced in future.
  */
-const updateDeployUrl = (ngBuildParams) => {
-    let buildArgs = ngBuildParams.split(' ');
+const updateDeployUrl = (args) => {
+    let buildArgs = args.ngBuildParams.split(' ');
     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;
+            }
+        });
     }
-    return ngBuildParams = buildArgs.join(" ");
+    buildArgs.push(args.nodeVMArgs);
+    return buildArgs.join(" ");
 };
 
 /**
@@ -59,10 +67,10 @@ const buildAngularApp = (args) => {
         process.exit(err.code || err.pid);
     }
 
-    let ngBuildParams = updateDeployUrl(args.ngBuildParams);
+    let ngBuildParams = updateDeployUrl(args);
     const NG_BUILD_MSG = 'NG BUILD MIGHT HAVE FAILED WITH HEAP OUT OF MEMORY, RE-EXECUTE THE BUILD BY INCREASING THE MAX-OLD-SPACE-SIZE ARGUMENT VALUE FOR BUILD.UI.NODE.ARGS PROPERTY IN DEPLOYMENT PROFILE';
     // Generating the angular build and post build process.
-    executeSyncCmd('cd ' + args.appTarget + ' && node ' + args.nodeVMArgs.trim() + ' ./build-scripts/build.js ' + ngBuildParams , null, MSG_NG_RUNTIME_LOG, false, NG_BUILD_MSG);
+    executeSyncCmd('cd ' + args.appTarget + ' && node ./build-scripts/build.js ' + ngBuildParams, null, MSG_NG_RUNTIME_LOG, false, NG_BUILD_MSG);
 }