@wavemaker/angular-codegen 11.14.2-rc.6311 → 11.15.0-rc.245

package/angular-app/src/tsconfig.app.json

@@ -8,7 +8,10 @@
         "allowJs": true
     },
     "exclude": [
-        "test.ts",
-        "**/*.spec.ts"
+        "**/*.spec.ts",
+        "app/extensions/formatters.js",
+        "environments/environment.*.ts",
+        "setup-jest.js",
+        "test.ts"
     ]
 }

package/build-angular-app.js

@@ -15,7 +15,7 @@
 const fs = require('fs');
 const rimraf = require('rimraf');
 const { downloadNPMPackage } = require('./download-packages');
-const { generateRandomHash } = require('./src/wm-utils');
+const { generateRandomHash, mergePackageJsonWithOverrideJson} = require('./src/wm-utils');
 const archiver = require('archiver');
 const path = require("path");
 const { executeSyncCmd,  MSG_NG_RUNTIME_LOG, MSG_NG_RUNTIME_SUCCESS } = require('./build-util');
@@ -81,6 +81,17 @@ const processAngularAppPackage = async (sourcePath, targetPath, packageName, isO
 
         // Install dependencies
         const installPath = isOptimized ? sourcePath : targetPath;
+        try {
+            if (global.buildConfigObj.runInspection && !isOptimized && fs.existsSync(path.join(global.buildConfigObj.appSrc, "build-src/package-override.json")) && fs.existsSync(path.join(installPath, 'package.json'))) {
+                let packageJson = JSON.parse(fs.readFileSync(path.join(installPath, 'package.json'), 'utf8'));
+                packageJson = await mergePackageJsonWithOverrideJson(global.buildConfigObj.appSrc, packageJson);
+                fs.writeFileSync(path.join(installPath, 'package.json'), JSON.stringify(packageJson, null, 4));
+                console.log("Successfully updated generated-app package.json with package-override.json");
+            }
+        } catch (e) {
+            console.log("Failed to merge package-override.json into generated-app package.json: " + e);
+        }
+        
         let npmCommnd = `npm install --prefix ${installPath}`
         // For windows platforms, npm install command needs to be executed in the same directory as package.json file
         if (os.platform() === 'win32') {
@@ -451,6 +462,14 @@ const buildAsWebComponent = async () => {
 
 const initBuild = async (buildConfigObj) => {
     global.randomHash = generateRandomHash();
+    
+    if(buildConfigObj.runInspection && buildConfigObj.runInspection === 'true' && buildConfigObj.buildType === BUILD_TYPE.ANGULAR) {
+        buildConfigObj.optimizeUIBuild = false;
+        buildConfigObj.runInspection = true;
+    }
+    else {
+        buildConfigObj.runInspection = false;
+    }
     //making it global
     global.buildConfigObj = buildConfigObj;