@pega/custom-dx-components 23.1.11 → 23.1.12

package/src/tasks/promote-webpack/index.js

@@ -9,7 +9,8 @@ import inquirer from 'inquirer';
 import {
   convertIntoPascalCase,
   checkPathAccess,
-  showVersion
+  showVersion,
+  updateUseWebPackPromotion
 } from '../../util.js';
 
 import {
@@ -22,8 +23,6 @@ import {
 
 
 
-let redirectFile = "";
-
 export const copyWebPack = async () => {
 
    // first check to see if already have the file
@@ -79,48 +78,23 @@ export const copyWebPack = async () => {
     }
 
 
-
-
-
+    console.log(chalk.bold.green(`Bundler now using ${newWebPackConfigDir}.`));
+    console.log(chalk.bold.green(`Utilize this file for webpack modifications.`));
 
   }
 
-  redirectFile = newWebPackConfigDir;
-
-
-
-}
-
-export const updateBuilder = async () => {
-
-  const builderIndexDir = fileURLToPath(new URL(BUILDER_INDEX_FILE_PATH, import.meta.url));
-
-  let indexFileJS = fs.readFileSync(builderIndexDir, { encoding: 'utf8' });
 
-  if (indexFileJS.length > 0) {
-    // comment out original webpack reference
-
-    // if not commented out, comment out
-    if (indexFileJS.indexOf("// import configFactory from './webpack.config.js';") < 0) {
-      indexFileJS = indexFileJS.replaceAll("import configFactory from './webpack.config.js';", "// import configFactory from './webpack.config.js';");
-    }
 
-    // uncomment out promoted webpack reference
-    indexFileJS = indexFileJS.replaceAll("// import configFactory from '../../../../../../../webpack.config.js';", "import configFactory from '../../../../../../../webpack.config.js';");
 
-    fs.writeFileSync(builderIndexDir, indexFileJS, { encoding: 'utf8' });
 
-    console.log(chalk.bold.green(`Bundler now using ${redirectFile}.`));
-    console.log(chalk.bold.green(`Utilize this file for webpack modifications.`));
-  }
+}
 
 
-}
 
 export default async options => {
   showVersion();
 
   await copyWebPack();
-  await updateBuilder();
+  await updateUseWebPackPromotion(true);
 
 };

package/src/tasks/publish/helper.js

@@ -94,7 +94,7 @@ export const zipComponent = async componentKey => {
 
   const configContent = Buffer.from(fs.readFileSync(`${srcDirectory}/config.json`)).toString();
 
-  fs.rmdir('dist', { recursive: true }, err => {
+  fs.rm('dist', { recursive: true }, err => {
     if (err) {
       throw err;
     }

package/src/tasks/publish/index.js

@@ -9,7 +9,7 @@ import { getComponentDirectoryPath, showVersion } from '../../util.js';
 
 import { getPublishComponentQuestions, publishComponentToServer, zipComponent } from './helper.js';
 
-export default async (options) => {
+export default async options => {
   showVersion();
 
   let componentKey;
@@ -19,13 +19,15 @@ export default async (options) => {
 
   let doFetch = true;
 
-  if (options.params.length >= 8) {
+  if (options.params.length >= 7) {
     componentKey = options.params[3];
     const rulesetName = options.params[4];
     const rulesetVersion = options.params[5];
     const dBuild = options.params[6];
     devBuild = dBuild === 'Y' || dBuild === 'y' || dBuild === true || dBuild === 'true';
-    doFetch = false;
+
+    // eslint-disable-next-line no-unneeded-ternary,no-nested-ternary
+    doFetch = options.params.length >= 7 ? (options.params[7] === 'noFetch' ? false : true) : true;
 
     content = { componentKey, rulesetName, rulesetVersion, devBuild };
   } else {
@@ -79,7 +81,7 @@ export default async (options) => {
     }
   );
 
-  await tasks.run().catch((err) => {
+  await tasks.run().catch(err => {
     console.log(chalk.bold.red(err.toString()));
   });
   return true;

package/src/tasks/publish-all/helper.js

@@ -159,55 +159,67 @@ export const publishComponentToServer = async (data, doFetch) => {
           headers.Authorization = `${tokenType} ${accessToken}`;
         }
 
-        fetch(url, {
+
+        const response = await fetch(url, {
           method: 'POST',
           agent: getHttpsAgent(defaultPegaConfig),
-          headers,
+          headers: headers,
           body: JSON.stringify(apiBody)
-        })
-          .then(response => {
-            status = response.status;
-            return response.text();
-          })
-          .then(resp => {
-            const respData = isLaunchpad ? resp : JSON.parse(resp);
-            if (status === 401) {
-              throw new Error(
-                'Error occurred in authentication. Please regenerate using authenticate'
-              );
-              // console.log(accessTokenUri, refreshToken);
-              /* TODO - Handle refresh_token */
-            } else if (status === 200 || status === 201) {
-              console.log(
+        });
+
+        status = response.status;
+        if (!response.ok) {
+          if (status === 401) {
+            throw new Error(
+              'Error occurred in authentication. Please regenerate using authenticate'
+            );
+            // console.log(accessTokenUri, refreshToken);
+            /* TODO - Handle refresh_token */
+          }
+          else if (status === 404){
+            throw new Error('404: Server resource not found');
+          }
+          else if (status === 405){
+            throw new Error('405: Server method not allowed');
+          }
+          else if (status === 408){
+            throw new Error('408: Server timed out');
+          }
+          else if (response.status === 403) {
+            throw new Error(
+              'Error forbidden: User does not have privileges to Publish.'
+            );
+          }
+        }
+
+        try {
+          const respData = isLaunchpad ? await response.text() : await response.json();
+          console.log(
                 chalk.bold.green(`Success : ${isLaunchpad ? respData : respData.message}`)
+          );
+
+          if (status === 500) {
+            status = 999;
+            throw new Error(respData.message);
+          }
+        }
+        catch (err) {
+          if (status === 500) {
+              throw new Error(
+               `Error occurred in authentication. Please regenerate using authenticate`
               );
-            } else {
-              throw new Error(`${respData.message}`);
-            }
-          })
-          .catch(e => {
-            if (e.code === 'ECONNREFUSED') {
-              // eslint-disable-next-line prefer-promise-reject-errors
-              Promise.reject(
-                `${chalk.bold.red(
-                  'Error occurred in authentication. Please regenerate using authenticate'
-                )}`
-              );
-            } else if (status === 403) {
-              // eslint-disable-next-line prefer-promise-reject-errors
-              Promise.reject(
-                `${chalk.bold.red('Error forbidden: User does not have privileges to Publish.')}`
-              );
-            } else {
-              // eslint-disable-next-line prefer-promise-reject-errors
-              Promise.reject(`${chalk.bold.red(e)}`);
-            }
-          });
+          }
+          else if (status === 999) {
+            throw new Error (err);
+          }
+        }
+
       } else {
         throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
       }
     } catch (err) {
-      throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
+      // throw new Error(`Error occurred in authentication. Please regenerate using authenticate`);
+      throw new Error(err);
     }
   }
 };

package/src/tasks/publish-all/index.js

@@ -16,8 +16,8 @@ import {
 
 export function getCustomTasks(componentKey, sourceMap, devBuild, content, options) {
   const sDevBuild = devBuild ? '(dev build)' : '';
-  // eslint-disable-next-line no-unneeded-ternary
-  const doFetch = options.params.length >= 7 ? false : true;
+  // eslint-disable no-unneeded-ternary,no-nested-ternary
+  const doFetch = options.params.length >= 7 ? (options.params[6] === 'noFetch' ? false : true) : true;
   return new Listr(
     [
       {
@@ -26,13 +26,6 @@ export function getCustomTasks(componentKey, sourceMap, devBuild, content, optio
           await validate(componentKey);
         }
       },
-      {
-        title: `Bundle Component ${sDevBuild}`,
-        task: async () => {
-          await bundleComponent(componentKey, sourceMap, devBuild);
-        },
-        skip: () => (options.skipBundle ? 'Skipped bundling component' : undefined)
-      },
       {
         title: 'Lint component',
         task: async () => {
@@ -41,6 +34,13 @@ export function getCustomTasks(componentKey, sourceMap, devBuild, content, optio
           await lintComponent(targetDirectory);
         }
       },
+      {
+        title: `Bundle Component ${sDevBuild}`,
+        task: async () => {
+          await bundleComponent(componentKey, sourceMap, devBuild);
+        },
+        skip: () => (options.skipBundle ? 'Skipped bundling component' : undefined)
+      },
       {
         title: 'Zip Component',
         task: async () => {
@@ -55,9 +55,7 @@ export function getCustomTasks(componentKey, sourceMap, devBuild, content, optio
         }
       }
     ],
-    {
-      exitOnError: true
-    }
+    { concurrent: false, exitOnError: true }
   );
 }
 
@@ -76,7 +74,7 @@ export default async options => {
   let devBuild;
   let content;
 
-  if (options.params.length >= 7) {
+  if (options.params.length >= 6) {
     const rulesetName = options.params[3];
     const rulesetVersion = options.params[4];
     const dBuild = options.params[5];
@@ -94,16 +92,17 @@ export default async options => {
   }
 
   // eslint-disable-next-line no-shadow
-  for (const componentKey of components) {
+  for await (const componentKey of components) {
     console.log(chalk.bold.green(`Publishing: ${componentKey}`));
 
     const myCustomTasks = getCustomTasks(componentKey, sourceMap, devBuild, content, options);
 
-    // eslint-disable-next-line no-await-in-loop
-    await myCustomTasks.run().catch(err => {
+    try {
+      await myCustomTasks.run();
+    } catch (err) {
       console.log(chalk.bold.red(err.toString()));
       process.exit(1);
-    });
+    }
   }
 
   // once done, remove leftover directories

package/src/tasks/revert-webpack/index.js

@@ -8,7 +8,8 @@ import { up } from 'inquirer/lib/utils/readline.js';
 
 import {
   convertIntoPascalCase,
-  showVersion
+  showVersion,
+  updateUseWebPackPromotion
 } from '../../util.js';
 import {
   WEBPACK_CONFIG_JS_FILENAME,
@@ -33,37 +34,17 @@ export const renamePromotedWebPack = async () => {
     process.exit();
   }
 
+  console.log(chalk.bold.green("Bundler reverted to using internal webpack.config.js."));
   console.log(chalk.bold.green(`File ${promoteWebPackDir} marked as not used.`));
 
 }
 
-export const revertBuilder = async () => {
 
-  const builderIndexDir = fileURLToPath(new URL(BUILDER_INDEX_FILE_PATH, import.meta.url));
-
-  let indexFileJS = fs.readFileSync(builderIndexDir, { encoding: 'utf8' });
-
-  if (indexFileJS.length > 0) {
-    // uncomment out original webpack reference
-    indexFileJS = indexFileJS.replaceAll("// import configFactory from './webpack.config.js';", "import configFactory from './webpack.config.js';");
-
-    // comment out promoted webpack reference
-    if (indexFileJS.indexOf("// import configFactory from '../../../../../../../webpack.config.js';") < 0) {
-      indexFileJS = indexFileJS.replaceAll("import configFactory from '../../../../../../../webpack.config.js';", "// import configFactory from '../../../../../../../webpack.config.js';");
-    }
-
-    fs.writeFileSync(builderIndexDir, indexFileJS, { encoding: 'utf8' });
-
-    console.log(chalk.bold.green(`Bundler reverted to using internal webpack.config.js.`));
-  }
-
-
-}
 
 export default async options => {
   showVersion();
 
   await renamePromotedWebPack();
-  await revertBuilder();
+  await updateUseWebPackPromotion(false);
 
 };

package/src/util.js

@@ -19,24 +19,87 @@ import {
   OOTB_COMPONENT_SERVICE_REST_ENDPOINT,
   DELETE_COMPONENT_SERVICE_REST_ENDPOINT,
   LP_DELETE_COMPONENT_SERVICE_REST_ENDPOINT,
-  OOTB_COMPONENTS
+  OOTB_COMPONENTS,
+  USE_PROMOTED_WEB_PACK
 } from './constants.js';
 
 const access = promisify(fs.access);
 
-export const checkPathAccess = async (path, options = {}) => {
+export const checkPathAccess = async (path, options = {}, throwError = false) => {
   const { errorMessage } = options;
 
   try {
     await access(path, fs.constants.R_OK);
   } catch (err) {
-    const message =
-      errorMessage || `${chalk.red.bold('ERROR')} Could not able to access path - ${path}`;
-    console.error(message);
-    process.exit(1);
+    if (throwError) {
+      throw new Error(err);
+    }
+    else {
+      const message =
+        errorMessage || `${chalk.red.bold('ERROR')} Could not able to access path - ${path}`;
+      console.error(message);
+      process.exit(1);
+    }
+
   }
 };
 
+export const getUseWebPackPromotion = async () => {
+  const currentDirectory = process.cwd();
+  const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
+
+  try {
+    // force to throw error and not console log
+    await checkPathAccess(pegaConfigJsonPath, {}, true);
+  }
+  catch (ex) {
+    // when can't find it, always be false, assume no webpack override.
+    // This is IMPORTANT for init (npx install)
+    return false;
+  }
+
+  let data = fs.readFileSync(pegaConfigJsonPath, { encoding: 'utf8' });
+  data = JSON.parse(data);
+
+  if (!data[COMPONENTS_DIRECTORY_PATH]) {
+    console.error(
+      `${chalk.red.bold('ERROR')} Could not able find components directory path in config.json`
+    );
+    process.exit(1);
+  }
+
+  if (data[USE_PROMOTED_WEB_PACK] == null) {
+    // value doesn't exist in task config, so add it with default of false
+    data[USE_PROMOTED_WEB_PACK] = false;
+    await updateUseWebPackPromotion(false);
+  }
+
+  return data[USE_PROMOTED_WEB_PACK];
+
+}
+
+export const updateUseWebPackPromotion = async ( useValue = false ) => {
+  const currentDirectory = process.cwd();
+  const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
+
+  await checkPathAccess(pegaConfigJsonPath);
+
+  let data = fs.readFileSync(pegaConfigJsonPath, { encoding: 'utf8' });
+  data = JSON.parse(data);
+
+  if (!data[COMPONENTS_DIRECTORY_PATH]) {
+    console.error(
+      `${chalk.red.bold('ERROR')} Could not able find components directory path in config.json`
+    );
+    process.exit(1);
+  }
+
+  data["usePromotedWebPack"] = useValue;
+
+  fs.writeFileSync(pegaConfigJsonPath, JSON.stringify(data, null, 4), { encoding: 'utf8' });
+
+}
+
 export const deleteLocalComponent = async componentKey => {
   const currentDirectory = process.cwd();
   const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
@@ -360,46 +423,68 @@ export const deleteInfinityServerComponent = async componentKey => {
 
     if (OauthData) {
       const { access_token: accessToken, token_type: tokenType } = JSON.parse(OauthData);
-      fetch(deleteUrl, {
+
+      const response = await fetch(deleteUrl, {
         method: 'DELETE',
         agent: getHttpsAgent(serverConfig),
         headers: {
           Authorization: `${tokenType} ${accessToken}`
         }
-      })
-        .then(response => {
-          status = response.status;
-          return response.text();
-        })
-        .then(resp => {
-          let respData;
-          try {
-            respData = JSON.parse(resp);
-          } catch (e) {
-            console.log(chalk.bold.redBright(`Failure : ${resp}`));
-            process.exit(1);
-          }
+      });
+
+      status = response.status;
+      if (!response.ok) {
+        if (status === 401) {
+          throw new Error(
+            'Error occurred in authentication. Please regenerate using authenticate'
+          );
+          // console.log(accessTokenUri, refreshToken);
+          /* TODO - Handle refresh_token */
+        }
+        else if (status === 404){
+          throw new Error('404: Server resource not found');
+        }
+        else if (status === 405){
+          throw new Error('405: Server method not allowed');
+        }
+        else if (status === 408){
+          throw new Error('408: Server timed out');
+        }
+        else if (response.status === 403) {
+          throw new Error(
+            'Error forbidden: User does not have privileges to Publish.'
+          );
+        }
 
-          if (status === 200) {
-            console.log(chalk.bold.green(`Success : ${respData.message}`));
-          } else {
-            throw new Error(`${respData.message}`);
-          }
-        })
-        .catch(e => {
-          if (status === 403) {
-            // eslint-disable-next-line prefer-promise-reject-errors
-            Promise.reject(
-              `${chalk.bold.red('Error forbidden: User does not have privileges to Delete.')}`
+
+      }
+
+      try {
+        const respData = await response.json();
+        console.log(
+              chalk.bold.green(`Success : ${respData.message}`)
+        );
+
+        if (status === 500) {
+          status = 999;
+          throw new Error(respData.message);
+        }
+      }
+      catch (err) {
+        if (status === 500) {
+            throw new Error(
+             `Error occurred in authentication. Please regenerate using authenticate`
             );
-          } else {
-            // eslint-disable-next-line prefer-promise-reject-errors
-            Promise.reject(`${chalk.bold.red(e)}`);
-          }
-        });
+        }
+        else if (status === 999) {
+          throw new Error (err);
+        }
+      }
+
     }
   } catch (error) {
-    console.log(`\n${chalk.bold.red(error)}`);
+
+    throw new Error(error);
   }
 };
 
@@ -430,42 +515,62 @@ export const deleteLaunchpadServerComponent = async componentKey => {
         componentName
       };
 
-      fetch(deleteUrl, {
+
+      const response = await fetch(deleteUrl, {
         method: 'DELETE',
         agent: new https.Agent({ rejectUnauthorized: false }),
         headers,
         body: JSON.stringify(apiBody)
-      })
-        .then(response => {
-          status = response.status;
-          return response.text();
-        })
-        .then(response => {
-          if (status === 401) {
+      });
+
+      status = response.status;
+      if (!response.ok) {
+        if (status === 401) {
+          throw new Error(
+            'Error occurred in authentication. Please regenerate using authenticate'
+          );
+          // console.log(accessTokenUri, refreshToken);
+          /* TODO - Handle refresh_token */
+        }
+        else if (status === 404){
+          throw new Error('404: Server resource not found');
+        }
+        else if (status === 405){
+          throw new Error('405: Server method not allowed');
+        }
+        else if (status === 408){
+          throw new Error('408: Server timed out');
+        }
+        else if (response.status === 403) {
+          throw new Error(
+            'Error forbidden: User does not have privileges to Publish.'
+          );
+        }
+      }
+
+      try {
+        const respData = await response.text();
+        console.log(
+              chalk.bold.green(`Success : ${respData}`)
+        );
+
+        if (status === 500) {
+          status = 999;
+          throw new Error(respData.message);
+        }
+      }
+      catch (err) {
+        if (status === 500) {
             throw new Error(
-              'Error occurred in authentication. Please regenerate using authenticate'
-            );
-            // console.log(accessTokenUri, refreshToken);
-            /* TODO - Handle refresh_token */
-          } else if (status === 200 || status === 201) {
-            console.log(chalk.bold.green(`Success : ${response}`));
-          } else {
-            throw new Error(`${response.message}`);
-          }
-        })
-        .catch(e => {
-          if (status === 403) {
-            // eslint-disable-next-line prefer-promise-reject-errors
-            Promise.reject(
-              `${chalk.bold.red('Error forbidden: User does not have privileges to Delete.')}`
+             `Error occurred in authentication. Please regenerate using authenticate`
             );
-          } else {
-            // eslint-disable-next-line prefer-promise-reject-errors
-            Promise.reject(`${chalk.bold.red(e)}`);
-          }
-        });
+        }
+        else if (status === 999) {
+          throw new Error (err);
+        }
+      }
     }
   } catch (error) {
-    console.log(`\n${chalk.bold.red(error)}`);
+    throw new Error(error);
   }
 };