@pega/dx-component-builder-sdk 0.1.48 → 0.8.1

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

@@ -1,6 +1,5 @@
 import fs from 'fs';
 import path from 'path';
-import https from 'https';
 
 import fetch from 'node-fetch';
 import AdmZip from 'adm-zip';
@@ -14,7 +13,8 @@ import {
   getPegaServerConfig,
   getOptionsCategory,
   getLocalComponentKeyFromConfig,
-  getFramework
+  getFramework,
+  getHttpsAgent
 } from '../../util.js';
 
 import { PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT,
@@ -245,7 +245,7 @@ export const publishComponentToServer = async (data, doFetch = true) => {
         let status = 500;
         fetch(url, {
           method: 'POST',
-          agent: new https.Agent({ rejectUnauthorized: false }),
+          agent: getHttpsAgent(defaultPegaConfig),
           headers: {
             Authorization: `${tokenType} ${accessToken}`
           },

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

@@ -4,7 +4,7 @@ import chalk from 'chalk';
 
 import validate from '../validator/index.js';
 import { getComponentDirectoryPath, showVersion, getOptionsCategory, getComponentsObj, getFramework, getLocalComponentKeyFromConfig, convertIntoKebabCase, convertIntoPascalCase } from '../../util.js';
-import { bundleReactComponent, bundleAngularComponent} from '../bundle/index.js';
+import { bundleReactComponent, bundleAngularComponent, bundleAssociatedComponent} from '../bundle/index.js';
 import { updateComponentMap  } from '../map/map.js';
 import { lintComponent } from '../linter/index.js';
 import { CATEGORY_CONSTELLATION, CATEGORY_CUSTOM } from '../../constants.js';
@@ -78,7 +78,7 @@ export function getCustomTasks(componentKey, category, sourceMap, devBuild, cont
       },
       {
         title: `Bundle associated component ${sDevBuild}`,
-        task: async () => await bundleReactComponent(associatedComponentKey, sourceMap, devBuild, CATEGORY_CONSTELLATION),
+        task: async () => await bundleAssociatedComponent(associatedComponentKey, sourceMap, devBuild, CATEGORY_CONSTELLATION),
         skip: () => (options.skipBundle ? 'Skipped bundling component' : undefined)
       },
       {
@@ -112,6 +112,9 @@ export function getOverrideTasks(componentKey, category, sourceMap, devBuild, co
   const sDevBuild = devBuild ? '(dev build)' : '';
   const sFramework = framework.split("-")[1];
 
+  // don't fetch if testing
+  const doFetch = options.params.length >= 7 ? false : true;
+
   return new Listr(
     [
       {
@@ -156,7 +159,7 @@ export function getOverrideTasks(componentKey, category, sourceMap, devBuild, co
       {
         title: 'Publish component config',
         task: async () => {
-          await publishComponentToServer(content);
+          await publishComponentToServer(content, doFetch);
         }
       }
     ],
@@ -201,7 +204,7 @@ export default async options => {
     const catQuestion = await getBuildCategory(options);
     const catAnswers = await inquirer.prompt(catQuestion);
 
-  
+
     category = catAnswers.category;
     if (category == null) {
       category = getOptionsCategory(options);
@@ -214,11 +217,11 @@ export default async options => {
       console.log(chalk.redBright("No components to publish"));
       process.exit(1);
     }
-  
+
     const questions = await getPublishComponentQuestions(category);
     const answers = await inquirer.prompt(questions);
     ({sourceMap, devBuild } = answers);
-  
+
     content = {
       ...answers
     };

package/src/util.js

@@ -4,6 +4,7 @@ import { join } from 'path';
 import { promisify } from 'util';
 import https from 'https';
 import inquirer from 'inquirer';
+import crypto from 'node:crypto';
 import { createRequire } from "module";
 
 import chalk from 'chalk';
@@ -195,8 +196,17 @@ export const deleteLocalComponent = async (componentKey, category = CATEGORY_CUS
   }
 };
 
+export const getHttpsAgent = (serverConfig) => {
+  const agentOptions = { rejectUnauthorized: false };
+  if (serverConfig.legacyTLS) {
+    agentOptions.secureOptions = crypto.constants.SSL_OP_LEGACY_SERVER_CONNECT;
+  }
+  return new https.Agent(agentOptions);
+};
+
 export const deleteServerComponent = async componentKey => {
-  const { server, user, password } = await getPegaServerConfig();
+  const serverConfig = await getPegaServerConfig();
+  const { server, user, password } = serverConfig;
   const url = constructCompleteUrl(server, DELETE_COMPONENT_SERVICE_REST_ENDPOINT);
   const [componentName, rulesetName, rulesetVersion] = componentKey.split('~|~');
   const deleteUrl = `${url}/${componentName}/rulesetname/${rulesetName}/rulesetversion/${rulesetVersion}`;
@@ -213,7 +223,7 @@ export const deleteServerComponent = async componentKey => {
       } = JSON.parse(OauthData);
       fetch(deleteUrl, {
         method: 'DELETE',
-        agent: new https.Agent({ rejectUnauthorized: false }),
+        agent: getHttpsAgent(serverConfig),
         headers: {
           Authorization: `${tokenType} ${accessToken}`
         }
@@ -690,22 +700,6 @@ export const constructCompleteUrl = (baseServer, endPoint) => {
   return baseServer.endsWith('/') ? `${baseServer}${endPoint}` : `${baseServer}/${endPoint}`;
 };
 
-export const nodeFetch = (url, config) => {
-  const { method, user, password, headers, ...restConfig } = config;
-
-  if (url.startsWith('https')) restConfig.agent = new https.Agent({ rejectUnauthorized: false });
-
-  return fetch(url, {
-    method,
-    ...restConfig,
-    headers: {
-      'Content-Type': 'application/json;charset=utf-8',
-      Authorization: `Basic ${Buffer.from(`${user}:${password}`).toString('base64')}`,
-      ...headers
-    }
-  });
-};
-
 export const sanitize = str => {
   /* Allow only numbers and case insensitive alphabets */
   str = str.replace(/[^a-zA-Z0-9 ]/g, '');
@@ -754,7 +748,8 @@ export const getOOTBComponents = async () => {
     fs.readFile(OOTB_COMPONENTS, 'utf-8', async (err, data) => {
       if (err) {
         try {
-          const { server } = await getPegaServerConfig();
+          const serverConfig = await getPegaServerConfig();
+          const { server } = serverConfig;
           const url = constructCompleteUrl(server, OOTB_COMPONENT_SERVICE_REST_ENDPOINT);
           const OauthData = fs.readFileSync(TOKEN_PATH, 'utf8');
           if (OauthData) {
@@ -765,7 +760,7 @@ export const getOOTBComponents = async () => {
             } = JSON.parse(OauthData);
             fetch(url, {
               method: 'GET',
-              agent: new https.Agent({ rejectUnauthorized: false }),
+              agent: getHttpsAgent(serverConfig),
               headers: {
                 Authorization: `${tokenType} ${accessToken}`
               }