@pega/custom-dx-components 0.23.36 → 0.23.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pega/custom-dx-components",
-  "version": "0.23.36",
+  "version": "0.23.38",
   "description": "Utility for building custom UI components",
   "bin": "./bin/index.js",
   "scripts": {

package/src/constants.js

@@ -4,6 +4,7 @@ export const PACKAGE_JSON_FILENAME = 'package.json';
 export const BUILD_CONFIG_JSON_FILENAME = 'build.config.json';
 export const WEBPACK_CONFIG_JS_FILENAME = 'webpack.config.js';
 export const WEBPACK_PATHS_JS_FILENAME = 'paths.js';
+export const USE_PROMOTED_WEB_PACK = 'usePromotedWebPack';
 export const COMPONENTS_DIRECTORY_PATH = 'components-directory-path';
 export const COMPONENTS_PATH = 'component';
 export const TOKEN_PATH = 'node_modules/@pega/custom-dx-components/.access_token';

package/src/tasks/bundle/builder/index.js

@@ -3,12 +3,15 @@ import fs from 'fs-extra';
 import webpack from 'webpack';
 import FileSizeReporter from 'react-dev-utils/FileSizeReporter.js';
 import printBuildError from 'react-dev-utils/printBuildError.js';
+import { getUseWebPackPromotion} from '../../../util.js';
 
 
+const usePromoted = await getUseWebPackPromotion();
 // used by promote and revert webPack commands, do not change
-import configFactory from './webpack.config.js';
-// import configFactory from '../../../../../../../webpack.config.js';
-// do not change
+const configFactory = (
+  await import(`${usePromoted ? `../../../../../../../webpack.config.js` : `./webpack.config.js`}`)
+).default
+
 
 import paths from './paths.js';
 

package/src/tasks/init/template/package.json.mustache

@@ -28,11 +28,11 @@
     "lint:styles": "stylelint \"./**/*.@(js|jsx|ts|tsx)\"",
     "lint:format": "prettier -c .",
     "lint:spelling": "cspell --no-progress **/*",
-    "test": "echo 'Running functional and unit tests will DELETE existing local components, proceed (y/n)?' && read proceed && if test \"$proceed\" = \"y\"; then npm run test:full; fi ",
-    "test:full": "npm run test:functional && npm run test:unit",
-    "test:functional": "npm run test:functional:local --prefix node_modules/@pega/custom-dx-components",
     "test-coverage": "node --input-type=module  --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand node_modules/@pega/custom-dx-component --ci --testResultsProcessor='jest-junit' --coverage",
-    "test:unit": "npm run test:unit:local --prefix node_modules/@pega/custom-dx-components"
+    "_internal-test": "echo 'Running functional and unit tests will DELETE existing local components, proceed (y/n)?' && read proceed && if test \"$proceed\" = \"y\"; then npm run internal-test-full; fi ",
+    "_internal-test-full": "npm run _internal-test-functional && npm run _internal-test-unit",
+    "_internal-test-functional": "npm run test:functional:local --prefix node_modules/@pega/custom-dx-components",
+    "_internal-test-unit": "npm run test:unit:local --prefix node_modules/@pega/custom-dx-components"
   },
     "scriptsComments": {
     "build": "tsc -b tsconfig.build.json",
@@ -69,7 +69,7 @@
   },
   "devDependencies": {
     "@pega/configs": "^0.6.0",
-    "@pega/custom-dx-components": "0.23.36",
+    "@pega/custom-dx-components": "0.23.38",
     "@pega/pcore-pconnect-typedefs": "~2.1.1",
     "@storybook/addon-actions": "^7.6.7",
     "@storybook/addon-essentials": "^7.6.7",

package/src/tasks/init/template/tasks.config.json

@@ -27,6 +27,7 @@
     "questions_askOnce": "server,authService",
     "questions_askedOnce": ""
   },
+  "usePromotedWebPack": false,
   "component": {
     "library": "Extensions",
     "type": "",

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 {
@@ -91,36 +92,12 @@ export const copyWebPack = async () => {
 
 }
 
-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-all/index.js

@@ -17,7 +17,7 @@ import {
 export function getCustomTasks(componentKey, sourceMap, devBuild, content, options) {
   const sDevBuild = devBuild ? '(dev build)' : '';
   // eslint-disable no-unneeded-ternary,no-nested-ternary
-  const doFetch = options.params.length >= 7 ? options.params[6] !== 'noFetch' : true;
+  const doFetch = options.params.length >= 7 ? (options.params[6] === 'noFetch' ? false : true) : true;
   return new Listr(
     [
       {

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,
@@ -37,33 +38,12 @@ export const renamePromotedWebPack = async () => {
 
 }
 
-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,7 +19,8 @@ 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);
@@ -37,6 +38,54 @@ export const checkPathAccess = async (path, options = {}) => {
   }
 };
 
+export const getUseWebPackPromotion = async () => {
+  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);
+  }
+
+  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);