@wavemaker/angular-codegen 11.0.2-rc.5184 → 11.0.2-rc.5185

angular-codegen/angular-app/angular.json

@@ -19,7 +19,10 @@
                         "indexTransform": "./build-scripts/index-html-transform.js",
                         "deployUrl": "ng-bundle/",
                         "outputPath": "dist/ng-bundle",
-                        "index": "src/index.html",
+                        "index": {
+                            "input": "src/index.html",
+                            "output": "../index.html"
+                        },
                         "main": "src/main.ts",
                         "polyfills": "src/polyfills.ts",
                         "tsConfig": "src/tsconfig.app.json",
@@ -74,7 +77,7 @@
                             "./node_modules/@wavemaker/app-ng-runtime/scripts/swipey/swipey.jquery.plugin.js",
                             "./node_modules/@wavemaker/app-ng-runtime/scripts/jquery.ui.touch-punch/jquery.ui.touch-punch.min.js",
                             "./node_modules/moment/min/moment.min.js",
-                            "./node_modules/fullcalendar/dist/fullcalendar.min.js",
+                            "./node_modules/fullcalendar/main.min.js",
                             "./node_modules/summernote/dist/summernote-lite.min.js",
                             "./node_modules/hammerjs/hammer.min.js",
                             "./node_modules/iscroll/build/iscroll.js",
@@ -93,7 +96,6 @@
                             "optimization": true,
                             "outputHashing": "all",
                             "sourceMap": false,
-                            "extractCss": true,
                             "namedChunks": false,
                             "aot": true,
                             "extractLicenses": true,
@@ -116,7 +118,6 @@
                             "optimization": false,
                             "outputHashing": "all",
                             "sourceMap": false,
-                            "extractCss": true,
                             "namedChunks": true,
                             "aot": true,
                             "extractLicenses": false,
@@ -135,7 +136,10 @@
                     "builder": "@angular-devkit/build-angular:browser",
                     "options": {
                         "outputPath": "dist",
-                        "index": "src/index.html",
+                        "index": {
+                            "input": "src/index.html",
+                            "output": "../index.html"
+                        },
                         "main": "src/main.ts",
                         "polyfills": "src/polyfills.ts",
                         "tsConfig": "src/tsconfig.app.json",
@@ -168,19 +172,27 @@
                             "./node_modules/jquery-ui/ui/widgets/droppable.js",
                             "./libraries/scripts/datatable/datatable.js",
                             "./node_modules/moment/min/moment.min.js",
-                            "./node_modules/fullcalendar/dist/fullcalendar.min.js",
+                            "./node_modules/fullcalendar/main.min.js",
                             "./node_modules/summernote/dist/summernote-lite.min.js",
                             "./node_modules/hammerjs/hammer.min.js",
                             "./node_modules/iscroll/build/iscroll.js",
                             "./node_modules/js-cookie/src/js.cookie.js",
                             "./node_modules/jssha/dist/sha256.js"
-                        ]
+                        ],
+                        "aot": false,
+                        "vendorChunk": true,
+                        "extractLicenses": false,
+                        "buildOptimizer": false,
+                        "sourceMap": true,
+                        "optimization": false,
+                        "namedChunks": true
                     },
                     "configurations": {
                         "production": {
                             "browserTarget": "angular-app:build:production"
                         }
-                    }
+                    },
+                    "defaultConfiguration": ""
                 },
                 "serve": {
                     "builder": "@angular-devkit/build-angular:dev-server",

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

@@ -74,8 +74,8 @@ const setMobileProjectType = (angularJson) => {
 const addMobileSpecificStyles = async (deployUrl) => {
     if (isDevBuild) {
         $("body").append(
-            `<script> const WMStylesPath ="${deployUrl}/wm-android-styles.js" </script>`
-        )
+            `<script type="text/javascript" defer="true" src="${deployUrl}/wm-android-styles.js"></script>`
+        );
     }
 
     if (isProdBuild) {
@@ -92,40 +92,23 @@ const addMobileSpecificStyles = async (deployUrl) => {
     }
 }
 
-const addScriptForWMStylesPath = () => {
-    // Add print css on load
-    $("body").append(`<script>
-            (function () {
-                if (typeof WMStylesPath !== "undefined") {
-                    let styleType = WMStylesPath.split(".").pop();
-                    let styleNode;
-                    if(styleType==="css"){
-                        styleNode = document.createElement("link");
-                        styleNode.type = "text/css";
-                        styleNode.rel = "stylesheet";
-                        styleNode.href = WMStylesPath;
-                    }
-                    else if(styleType==="js"){
-                        styleNode = document.createElement("script");
-                        styleNode.type = "text/javascript";
-                        styleNode.src = WMStylesPath;
-                        styleNode.defer = true;
-                    }
-
-                    styleNode && document
-                        .getElementsByTagName("head")[0]
-                        .appendChild(styleNode);
-                }
-            })()
-            window.onload = function() {
-                 var printCssNode = document.createElement('link');
-                 printCssNode.type = 'text/css';
-                 printCssNode.rel = 'stylesheet';
-                 printCssNode.href = 'print.css';
-                 printCssNode.media = 'print';
-                 document.getElementsByTagName("head")[0].appendChild(printCssNode);
-             }
-            </script>`);
+const addScriptForWMStylesPath = (wm_styles_path) => {
+    // wm_styles_path will not be present for mobile apps
+    if (wm_styles_path) {
+        let styleType = wm_styles_path.split(".").pop();
+        if(styleType==="css"){
+            $("head").append(
+                `<link rel="stylesheet" type="text/css" href="${wm_styles_path}"/>`
+            );
+        } else {
+            $("body").append(
+                `<script type="text/javascript" defer="true" src="${wm_styles_path}"></script>`
+            );
+        }
+    }
+    $("head").append(
+        `<link rel="stylesheet" type="text/css" media="print" href="print.css"/>`
+    );
 }
 
 /**
@@ -155,9 +138,9 @@ const SKIP_UPDATE = ['index.html', 'manifest.json'];
 /**
  * Checks if a file's name has been changed during the build process
  * and if changed, returns an updated file path.
- * 
+ *
  * @param {string} deployUrl deployment url
- * @param {string} url an absolute url to check if its filename has changed 
+ * @param {string} url an absolute url to check if its filename has changed
  * @param {object} updatedFileNames a map from old filenames to new filenames
  * @returns {string} an updated file path
  */
@@ -176,8 +159,8 @@ const getUpdatedFileName = (deployUrl, url, updatedFileNames) => {
 /**
  * Checks if a file's content has been changed during the build process
  * and if changed, returns a new hash to be updated in ngsw.json
- * 
- * @param {string} url an absolute url to check if its filename has changed 
+ *
+ * @param {string} url an absolute url to check if its filename has changed
  * @param {object} updatedFileHashes a map from filenames to file hashes
  * @returns {string} an updated file hash
  */
@@ -191,7 +174,7 @@ const getUpdatedFileHashes = (url, oldHash, updatedFileHashes) => {
 
 /**
  * Get the path of the icon without '/ng-bundle'
- * 
+ *
  * @param {string} iconPath path with '/ng-bundle'
  * @returns {string} path of the icon without '/ng-bundle'
  */
@@ -202,7 +185,7 @@ const getIconPath = (iconPath) => {
 
 /**
  * Updates name, location and content of PWA related assets.
- * 
+ *
  * @param {string} deployUrl deployment url
  * @param {object} updatedFileNames a map from old filenames to new filenames
  * @returns {void}
@@ -245,7 +228,7 @@ const updatePwaAssets = (deployUrl, updatedFileNames, updatedFileHashes) => {
 
 /**
  * Generated sha1 hash for the content supplied.
- * 
+ *
  * @param {string} content the content to be hashed
  * @returns {string} the hash value
  */
@@ -263,10 +246,8 @@ const generateSha1 = (content) => {
             deployUrl = deployUrl.slice(0, deployUrl.length - 1);
         }
 
-        fs.copyFileSync('./dist/ng-bundle/index.html', './dist/index.html');
         const contents = await readFile(`./dist/index.html`, `utf8`);
         $ = cheerio.load(contents);
-        $('script').attr('defer', 'true');
         setMobileProjectType(angularJson);
         if (!isMobileProject) {
             isProdBuild = fs.existsSync(`${process.cwd()}/dist/ng-bundle/wm-styles.css`);
@@ -291,26 +272,23 @@ const generateSha1 = (content) => {
         const serviceWorkerEnabled = build['configurations']['production']['serviceWorker'];
         const updatedFilenames = {}
         const updatedFileHashes = {}
+        let wm_styles_path;
 
         if (isMobileProject) {
             await addMobileSpecificStyles(deployUrl);
         } else {
             if (isDevBuild) {
-                $("head").append(
-                    `<script> const WMStylesPath = "${deployUrl}/wm-styles.js" </script>`
-                )
+                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`
-                $("head").append(
-                    `<script> const WMStylesPath = "${deployUrl}/${updatedFileName}" </script>`
-                );
+                wm_styles_path = `${deployUrl}/${updatedFileName}`;
             }
         }
 
-        addScriptForWMStylesPath();
+        addScriptForWMStylesPath(wm_styles_path);
         const htmlContent = $.html();
         await writeFile(`./dist/index.html`, htmlContent);