@pega/custom-dx-components 2.0.24 → 2.0.25

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

@@ -1,31 +1,19 @@
 {
   "components-directory-path": "src/components",
   "server-config": {
+    "server": "https://localhost:38764/prweb",
+    "user": "user",
+    "password": "password",
     "rulesetName": "rulesetName",
     "rulesetVersion": "rulesetVersion",
     "sourceOfComponents": "Server",
     "devBuild": false,
-    "serverType": "infinity",
-    "server": "https://localhost:38764/prweb",
     "clientId": "",
-    "clientSecret_comment": "Needed only when using 'passwordCreds' or 'clientCreds' grantType",
-    "clientSecret": "",
-    "grantType": "authCode",
-    "redirectUri": "https://localhost:4010/",
-    "cert_and_key_comment": "Path to SSL certificate file and SSL key file to use when starting local HTTPS server",
-    "cert_and_key_comment2": "Needed only when using 'authCode' grantType and redirectUri begins with 'https://localhost'",
-    "cert": "",
-    "key": "",
-    "user_and_password_comment": "useful primarily when grantType is set to 'passwordCreds'",
-    "user": "",
-    "password": "",
-    "questions_askAlways": "",
-    "questions_askNever": ""
+    "clientSecret": ""
   },
   "component": {
     "library": "",
     "type": "",
-    "version": "",
     "subtype": "",
     "description": "",
     "icon": ""

package/src/tasks/list/index.js

@@ -10,8 +10,6 @@ import {
   getListComponentsQuestions
 } from './helper.js';
 
-import { showVersion } from '../../util.js';
-
 const getList = async (sourceOfComponents, answers) => {
   switch (sourceOfComponents) {
     case SOURCE_OF_COMPONENT_TYPES.LOCAL: {
@@ -34,8 +32,6 @@ const getList = async (sourceOfComponents, answers) => {
 };
 
 export default async options => {
-  showVersion();
-
   let sourceOfComponentsOption = SOURCE_OF_COMPONENT_TYPES.LOCAL;
 
   if (options.params[3] === SOURCE_OF_COMPONENT_TYPES.LOCAL) {

package/src/tasks/{bundle → publish/bundle}/builder/webpack.config.js

@@ -306,12 +306,14 @@ export default (
         contextRegExp: /moment$/
       }),
       /* Ignore cosmos icons */
+
       new webpack.IgnorePlugin({
         resourceRegExp: /^\.\/icons$/,
         contextRegExp: /@pega\/cosmos-react-core\/lib\/components\/Icon$/
       }),
 
       /* Ignore cosmos icons - windows */
+
       new webpack.IgnorePlugin({
         resourceRegExp: /^\.\/icons$/,
         contextRegExp: /@pega\\cosmos-react-core\\lib\\components\\Icon$/

package/src/tasks/{bundle → publish/bundle}/index.js

@@ -2,8 +2,8 @@ import path from 'path';
 import fs from 'fs';
 import { stat } from 'fs/promises';
 
-import { BUILD_CONFIG_JSON_FILENAME } from '../../constants.js';
-import { getComponentDirectoryPath } from '../../util.js';
+import { BUILD_CONFIG_JSON_FILENAME } from '../../../constants.js';
+import { getComponentDirectoryPath } from '../../../util.js';
 
 import buildComponent from './builder/index.js';
 

package/src/tasks/publish/index.js

@@ -4,15 +4,10 @@ import chalk from 'chalk';
 
 import validate from '../validator/index.js';
 
-import bundleComponent from '../bundle/index.js';
-import { lintComponent } from '../linter/index.js';
-
-import { getComponentDirectoryPath, showVersion } from '../../util.js';
+import bundleComponent from './bundle/index.js';
 import { getPublishComponentQuestions, publishComponentToServer, zipComponent } from './helper.js';
 
 export default async options => {
-  showVersion();
-
   const questions = await getPublishComponentQuestions();
   const answers = await inquirer.prompt(questions);
   const { componentKey, sourceMap, devBuild } = answers;
@@ -29,14 +24,6 @@ export default async options => {
           await validate(componentKey);
         }
       },
-      {
-        title: 'Lint component',
-        task: async () => {
-          const targetDirectory = await getComponentDirectoryPath(componentKey);
-          // console.log(`in buildComponent Lint component task: componentKey: ${componentKey} targetDirectory: ${targetDirectory}`);
-          await lintComponent(targetDirectory);
-        }
-      },
       {
         title: 'Bundle Component',
         task: async () => await bundleComponent(componentKey, sourceMap, devBuild),

package/src/util.js

@@ -7,8 +7,6 @@ import chalk from 'chalk';
 import mustache from 'mustache';
 import pascalCase from 'pascalcase';
 import fetch from 'node-fetch';
-import { createRequire } from 'module';
-
 
 import {
   COMPONENTS_DIRECTORY_PATH,
@@ -16,7 +14,8 @@ import {
   TOKEN_PATH,
   OOTB_COMPONENT_SERVICE_REST_ENDPOINT,
   DELETE_COMPONENT_SERVICE_REST_ENDPOINT,
-  OOTB_COMPONENTS
+  OOTB_COMPONENTS,
+  TOKEN_URL_V1
 } from './constants.js';
 
 const access = promisify(fs.access);
@@ -219,14 +218,6 @@ export const validateRulesetVersion = str => {
   return regex.test(str);
 };
 
-export const showVersion = () => {
-  // get package version, so can display at start
-  const require = createRequire(import.meta.url);
-  const pData = require("@pega/custom-dx-components/package.json");
-
-  console.log(chalk.green("DX Component Builder v" + pData.version));
-};
-
 export const getOOTBComponents = async () => {
   return new Promise((resolve, reject) => {
     fs.readFile(OOTB_COMPONENTS, 'utf-8', async (err, data) => {
@@ -280,3 +271,7 @@ export const getOOTBComponents = async () => {
     });
   });
 };
+
+export const getTokenUrl = async (server) => {
+  return server.endsWith('/') ? `${server}${TOKEN_URL_V1}` : `${server}/${TOKEN_URL_V1}`;
+};