@wavemaker/angular-codegen 11.11.0-rc.6106 → 11.11.0-rc.6112

package/build-angular-app.js

@@ -148,10 +148,11 @@ const buildAngularApp = async (args) => {
             if (!fs.existsSync(SUCCESS_FILE)) {
                 // Check if another process is already installing
                 if (fs.existsSync(LOCK_FILE)) {
-                    console.log('Waiting for another build to complete npm install...');
+                    console.log(`Waiting for another build to complete npm install... for package ${PACKAGE_NAME}`);
                     await waitForLock(LOCK_FILE, 20 * 60 * 1000); // Wait for 20 minutes (timeout in milliseconds)
                 } else {
                     // Acquire the lock
+                    fs.mkdirSync(TARBALL_DOWNLOAD_PATH, { recursive: true });
                     fs.writeFileSync(LOCK_FILE, "PROGRESS");
                     await processAngularAppPackage(TARBALL_DOWNLOAD_PATH, TARBALL_DOWNLOAD_PATH, PACKAGE_NAME, true);
                     fs.writeFileSync(SUCCESS_FILE, "SUCCESS");
@@ -166,11 +167,13 @@ const buildAngularApp = async (args) => {
         }
     } catch (err) {
         deleteFiles([SUCCESS_FILE, LOCK_FILE])
-        console.log(MSG_NG_RUNTIME_LOG + 'Something went wrong - ', err);
+        console.log(MSG_NG_RUNTIME_LOG + `Something went wrong - for package ${PACKAGE_NAME}`, err);
         process.exit(err.code || err.pid);
     } finally {
         //cleanup : in windows / optimizeUIBuild is false, we need to delete the temp downloaded package
-        deleteFiles([path.join(TARBALL_DOWNLOAD_PATH, 'package'), path.join(TARBALL_DOWNLOAD_PATH, ANGULAR_APP_TARBALL_NAME), LOCK_FILE])
+        if (args.optimizeUIBuild) {
+            deleteFiles([path.join(TARBALL_DOWNLOAD_PATH, 'package'), path.join(TARBALL_DOWNLOAD_PATH, ANGULAR_APP_TARBALL_NAME), LOCK_FILE])
+        }
     }
 
     let ngBuildParams = updateDeployUrl(args);
@@ -308,9 +311,10 @@ const copyRecursiveSync = (src, dest) => {
  *  Install the app-runtime-wm-build if package not yet installed.
  *  Based on the platform type copy the bundle script into '/src/main/webapp'
  * @param {*} sourceDir
+ * @param {*} baseDir
  * @returns
  */
-const buildAppInWMMode = (sourceDir, baseDir) => {
+const buildAppInWMMode = async (sourceDir, baseDir) => {
 
     /**
      * Download app-runtime-wm-build package and install if it doesn't exist
@@ -325,7 +329,7 @@ const buildAppInWMMode = (sourceDir, baseDir) => {
     };
 
     appRuntimeWMBuildPackageInfo.baseDir = baseDir;
-    const PATH_WAVEMAKER_APP_RUNTIME_WM_BUILD = downloadNPMPackage(appRuntimeWMBuildPackageInfo);
+    const PATH_WAVEMAKER_APP_RUNTIME_WM_BUILD = await downloadNPMPackage(appRuntimeWMBuildPackageInfo);
 
     const FILE_PATH_WAVEMAKER_APP_RUNTIME_WM_BUILD = PATH_WAVEMAKER_APP_RUNTIME_WM_BUILD + '/node_modules/' + appRuntimeWMBuildPackageInfo.scope + '/' + appRuntimeWMBuildPackageInfo.name + '/';
 
@@ -456,7 +460,7 @@ const initBuild = async (buildConfigObj) => {
     const sourceDir = buildConfigObj.appSrc;
     let appTarget = buildConfigObj.appTarget;
 
-    let baseDir = buildConfigObj.optimizeUIBuild ? undefined : appTarget.split('/').slice(0, 2).join('/') + '/';
+    let baseDir = buildConfigObj.optimizeUIBuild ? undefined : appTarget.split('/').slice(0, -2).join('/') + '/';
     if (buildConfigObj.generateOverrideCSS) {
         const { generateOverrideCSS } = require(CODEGEN_INSTALLATION + 'src/gen-app-override-css.js');
         await generateOverrideCSS(buildConfigObj, sourceDir, baseDir);
@@ -469,7 +473,7 @@ const initBuild = async (buildConfigObj) => {
         console.log('Angular app generation mode');
         await generateAngularApp(sourceDir, getNgBuildParams(), CODEGEN_INSTALLATION, appTarget, baseDir);
     } else if (buildType === BUILD_TYPE.WM) {
-        buildAppInWMMode(sourceDir, baseDir);
+        await buildAppInWMMode(sourceDir, baseDir);
     } else if (buildType === BUILD_TYPE.ANGULAR) {
         if(!isWebComponentBuild) {
             await generateAngularApp(sourceDir, getNgBuildParams(), CODEGEN_INSTALLATION, appTarget, baseDir);