@wavemaker/angular-codegen 11.7.0-next.139418 → 11.7.0-next.24769

angular-codegen/angular-app/angular.json

@@ -29,6 +29,11 @@
                         "assets": [
                             "src/favicon.ico",
                             "src/assets",
+                            {
+                                "glob": "print.css",
+                                "input": "src/assets/",
+                                "output": "."
+                            },
                             {
                                 "glob": "**/*",
                                 "input": "libraries/locales/",
@@ -187,7 +192,12 @@
                         "tsConfig": "src/tsconfig.app.json",
                         "assets": [
                             "src/favicon.ico",
-                            "src/assets"
+                            "src/assets",
+                            {
+                                "glob": "print.css",
+                                "input": "src/assets/",
+                                "output": "."
+                            }
                         ],
                         "styles": [
                             "src/styles.css",

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

@@ -0,0 +1,30 @@
+const { spawnSync } = require('child_process');
+const path = require('path');
+
+const args = process.argv.slice(2);
+
+const ngBuildArgs = ['build', ...args];
+console.log("Build params - ", ngBuildArgs);
+
+//Trigger angular build with the passed params
+const ngPath = path.resolve(process.cwd(), 'node_modules', '.bin', "ng");
+const ngBuildProcess = spawnSync(ngPath, ngBuildArgs, { stdio: 'inherit', shell: true });
+
+if (ngBuildProcess.status === 0) {
+    console.log('ng build completed successfully!');
+} else {
+    console.error('Error during ng build:', ngBuildProcess.error || ngBuildProcess.stderr);
+    process.exit(1);
+}
+
+const ngPostBuildArgs = ['build-scripts/post-build.js', ...args];
+console.log("Post build params - ", ngPostBuildArgs);
+
+const ngPostBuildProcess = spawnSync('node', ngPostBuildArgs, { stdio: 'inherit' });
+
+if (ngPostBuildProcess.status === 0) {
+    console.log('ng post build completed successfully!');
+} else {
+    console.error('Error during ng build:', ngPostBuildProcess.error || ngPostBuildProcess.stderr);
+    process.exit(1);
+}

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

@@ -76,7 +76,7 @@ const setMobileProjectType = (angularJson) => {
 const addMobileSpecificStyles = async (deployUrl) => {
     if (isDevBuild) {
         $("body").append(
-            `<script type="text/javascript" defer="true" src="${deployUrl}/wm-android-styles.js"></script>`
+            `<script type="text/javascript" defer="true" src="${deployUrl}wm-android-styles.js"></script>`
         );
     }
 
@@ -84,12 +84,12 @@ const addMobileSpecificStyles = async (deployUrl) => {
         let hash = await generateHash(`${opPath}/wm-android-styles.css`);
         copyMobileCssFiles(hash, 'wm-android-styles');
         $("head").append(
-            `<link rel="stylesheet" theme="wmtheme" href="${deployUrl}/wm-android-styles.${hash}.css" >`
+            `<link rel="stylesheet" theme="wmtheme" href="${deployUrl}wm-android-styles.${hash}.css" >`
         );
         hash = await generateHash(`${opPath}/wm-ios-styles.css`);
         copyMobileCssFiles(hash, 'wm-ios-styles');
         $("head").append(
-            `<link rel="stylesheet" theme="wmtheme" href="${deployUrl}/wm-ios-styles.${hash}.css" >`
+            `<link rel="stylesheet" theme="wmtheme" href="${deployUrl}wm-ios-styles.${hash}.css" >`
         );
     }
 }
@@ -108,8 +108,10 @@ const addScriptForWMStylesPath = (wm_styles_path) => {
             );
         }
     }
+}
+const addPrintStylesPath = (print_styles_path) => {
     $("head").append(
-        `<link rel="stylesheet" type="text/css" media="print" href="print.css"/>`
+        `<link rel="stylesheet" type="text/css" media="print" href="${print_styles_path}"/>`
     );
 }
 
@@ -153,7 +155,7 @@ const getUpdatedFileName = (deployUrl, url, updatedFileNames) => {
     }
 
     if (absUrl in updatedFileNames) {
-        return `${deployUrl}/${updatedFileNames[absUrl]}` // add the leading '/' back
+        return `${deployUrl}${updatedFileNames[absUrl]}` // add the leading '/' back
     }
     return `${deployUrl}${url}`;
 }
@@ -195,6 +197,8 @@ const getIconPath = (iconPath) => {
 const updatePwaAssets = (deployUrl, updatedFileNames, updatedFileHashes) => {
     const ngswPath = './dist/ngsw.json';
     const manifestPath = './dist/manifest.json';
+    //this is always from server in case of pwa. Need to fix this to use cdnurl from runtime/build config
+    deployUrl = deployUrl === "_cdnUrl_" ? 'ng-bundle/' : deployUrl;
 
     // copy service worker and its config to root directory
     fs.copyFileSync('./dist/ng-bundle/ngsw-worker.js', './dist/ngsw-worker.js');
@@ -206,7 +210,7 @@ const updatePwaAssets = (deployUrl, updatedFileNames, updatedFileHashes) => {
     const manifest = JSON.parse(fs.readFileSync(manifestPath).toString());
     const updatedManifest = {
         ...manifest,
-        icons: manifest.icons.map(icon => ({ ...icon, src: `${deployUrl}/${getIconPath(icon.src)}` })),
+        icons: manifest.icons.map(icon => ({ ...icon, src: `${deployUrl}${getIconPath(icon.src)}` })),
     }
     const manifestContent = JSON.stringify(updatedManifest, null, 4);
     fs.writeFileSync(manifestPath, manifestContent);
@@ -244,9 +248,6 @@ const generateSha1 = (content) => {
         const angularJson = require(`${process.cwd()}/angular.json`);
         const build = angularJson['projects']['angular-app']['architect']['build'];
         let deployUrl = args['deploy-url'] || build['options']['deployUrl'];
-        if (deployUrl.endsWith('/')) {
-            deployUrl = deployUrl.slice(0, deployUrl.length - 1);
-        }
 
         const contents = await readFile(`./dist/index.html`, `utf8`);
         $ = cheerio.load(contents);
@@ -278,17 +279,22 @@ const generateSha1 = (content) => {
             await addMobileSpecificStyles(deployUrl);
         } else {
             if (isDevBuild) {
-                wm_styles_path = `${deployUrl}/wm-styles.js`;
+                wm_styles_path = `${deployUrl}wm-styles.js`;
             } else {
                 const fileName = 'wm-styles';
                 const hash = await generateHash(`${opPath}/${fileName}.css`);
                 copyCssFiles(hash, updatedFilenames);
                 const updatedFileName = `${fileName}.${hash}.css`
-                wm_styles_path = `${deployUrl}/${updatedFileName}`;
+                wm_styles_path = `${deployUrl}${updatedFileName}`;
             }
         }
 
         addScriptForWMStylesPath(wm_styles_path);
+        addPrintStylesPath(`${deployUrl}print.css`);
+
+        //this is required to download all the assets
+        $('head').append(`<meta name="deployUrl" content=${deployUrl} />`);
+
         const htmlContent = $.html();
         await writeFile(`./dist/index.html`, htmlContent);