sfdx-jayree 4.4.38 → 4.5.1

package/CHANGELOG.md

@@ -1,3 +1,29 @@
+## [4.5.1](https://github.com/jayree/sfdx-jayree-plugin/compare/v4.5.0...v4.5.1) (2023-04-16)
+
+
+### Bug Fixes
+
+* **deps:** bump @jayree/sfdx-plugin-manifest from 3.0.10 to 3.0.11 ([#724](https://github.com/jayree/sfdx-jayree-plugin/issues/724)) ([72e47f5](https://github.com/jayree/sfdx-jayree-plugin/commit/72e47f5c60e644d204fb65847b09d28a3b2b5360))
+* **deps:** bump @jayree/sfdx-plugin-prettier from 1.2.36 to 1.2.37 ([#725](https://github.com/jayree/sfdx-jayree-plugin/issues/725)) ([5fc14d9](https://github.com/jayree/sfdx-jayree-plugin/commit/5fc14d99bf191221f20223236e6a7e65d5b95cf9))
+* **deps:** bump @jayree/sfdx-plugin-source from 1.0.3 to 1.0.5 ([#723](https://github.com/jayree/sfdx-jayree-plugin/issues/723)) ([a85504e](https://github.com/jayree/sfdx-jayree-plugin/commit/a85504e8dc5b58afd7f1e02bdc2ce6b2b63bfe9c))
+* **deps:** bump @salesforce/source-deploy-retrieve from 7.15.1 to 8.0.1 ([203bafc](https://github.com/jayree/sfdx-jayree-plugin/commit/203bafcba04553c72b4192dcdb198a0762f5e074))
+* **deps:** bump @salesforce/source-tracking from 2.2.28 to 3.1.1 ([245acb1](https://github.com/jayree/sfdx-jayree-plugin/commit/245acb196f5a8614d5930d0db38d7a25d66e3152))
+* **deps:** bump mkdirp from 2.1.3 to 3.0.0 ([f56fdfe](https://github.com/jayree/sfdx-jayree-plugin/commit/f56fdfeac2a288302094f2b58456881ecf63787b))
+
+# [4.5.0](https://github.com/jayree/sfdx-jayree-plugin/compare/v4.4.38...v4.5.0) (2023-04-16)
+
+
+### Bug Fixes
+
+* **deps:** bump listr2 from 5.0.8 to 6.2.0 ([bc507f8](https://github.com/jayree/sfdx-jayree-plugin/commit/bc507f8bb8dd6ea03268e09a6a212dedb46feb3d))
+* replace puppeteer with playwright ([54313b5](https://github.com/jayree/sfdx-jayree-plugin/commit/54313b5a61014f866ab95e99d98c1844ad328eee))
+* use new changelog ([48a9dad](https://github.com/jayree/sfdx-jayree-plugin/commit/48a9dad12726b70ecd023f723fe25a190f3ee266))
+
+
+### Features
+
+* use new source tracking commands plugin ([18648af](https://github.com/jayree/sfdx-jayree-plugin/commit/18648af21dc0a593ffb0a647cbc4bdce89682c87))
+
 ## [4.4.38](https://github.com/jayree/sfdx-jayree-plugin/compare/v4.4.37...v4.4.38) (2023-04-14)
 
 

package/README.md

@@ -24,7 +24,7 @@ $ sfdx plugins:install sfdx-jayree
 $ sfdx jayree:[COMMAND]
 running command...
 $ sfdx plugins
-sfdx-jayree 4.4.38
+sfdx-jayree 4.5.1
 $ sfdx help jayree:[COMMAND]
 USAGE
   $ sfdx jayree:COMMAND
@@ -54,6 +54,8 @@ USAGE
 * [`sfdx jayree:packagedescription:remove`](#sfdx-jayreepackagedescriptionremove)
 * [`sfdx jayree:packagedescription:set`](#sfdx-jayreepackagedescriptionset)
 * [`sfdx jayree:source:fix`](#sfdx-jayreesourcefix)
+* [`sfdx jayree:source:snapshot:compare`](#sfdx-jayreesourcesnapshotcompare)
+* [`sfdx jayree:source:snapshot:generate`](#sfdx-jayreesourcesnapshotgenerate)
 * [`sfdx jayree:source:tracking:list`](#sfdx-jayreesourcetrackinglist)
 * [`sfdx jayree:source:tracking:store:get`](#sfdx-jayreesourcetrackingstoreget)
 * [`sfdx jayree:source:tracking:store:set`](#sfdx-jayreesourcetrackingstoreset)
@@ -196,7 +198,7 @@ EXAMPLES
   ...
 ```
 
-_See code: [src/commands/jayree/flowtestcoverage.ts](https://github.com/jayree/sfdx-jayree-plugin/blob/v4.4.38/src/commands/jayree/flowtestcoverage.ts)_
+_See code: [src/commands/jayree/flowtestcoverage.ts](https://github.com/jayree/sfdx-jayree-plugin/blob/v4.5.1/src/commands/jayree/flowtestcoverage.ts)_
 
 ### `sfdx jayree:manifest:beta:git:diff`
 
@@ -304,7 +306,7 @@ EXAMPLES
   $ sfdx jayree:manifest:cleanup --manifest=package.xml --file=packageignore.xml
 ```
 
-_See code: [@jayree/sfdx-plugin-manifest](https://github.com/jayree/sfdx-plugin-manifest/blob/v3.0.10/src/commands/jayree/manifest/cleanup.ts)_
+_See code: [@jayree/sfdx-plugin-manifest](https://github.com/jayree/sfdx-plugin-manifest/blob/v3.0.11/src/commands/jayree/manifest/cleanup.ts)_
 
 ### `sfdx jayree:manifest:generate`
 
@@ -340,7 +342,7 @@ EXAMPLES
   <Package xmlns='http://soap.sforce.com/2006/04/metadata'>...</Package>
 ```
 
-_See code: [@jayree/sfdx-plugin-manifest](https://github.com/jayree/sfdx-plugin-manifest/blob/v3.0.10/src/commands/jayree/manifest/generate.ts)_
+_See code: [@jayree/sfdx-plugin-manifest](https://github.com/jayree/sfdx-plugin-manifest/blob/v3.0.11/src/commands/jayree/manifest/generate.ts)_
 
 ### `sfdx jayree:manifest:git:diff`
 
@@ -422,7 +424,7 @@ FLAG DESCRIPTIONS
     The location can be an absolute path or relative to the current working directory.
 ```
 
-_See code: [@jayree/sfdx-plugin-manifest](https://github.com/jayree/sfdx-plugin-manifest/blob/v3.0.10/src/commands/jayree/manifest/git/diff.ts)_
+_See code: [@jayree/sfdx-plugin-manifest](https://github.com/jayree/sfdx-plugin-manifest/blob/v3.0.11/src/commands/jayree/manifest/git/diff.ts)_
 
 ### `sfdx jayree:manifest:legacy:git:diff`
 
@@ -500,7 +502,7 @@ FLAG DESCRIPTIONS
     The location can be an absolute path or relative to the current working directory.
 ```
 
-_See code: [@jayree/sfdx-plugin-manifest](https://github.com/jayree/sfdx-plugin-manifest/blob/v3.0.10/src/commands/jayree/manifest/legacy/git/diff.ts)_
+_See code: [@jayree/sfdx-plugin-manifest](https://github.com/jayree/sfdx-plugin-manifest/blob/v3.0.11/src/commands/jayree/manifest/legacy/git/diff.ts)_
 
 ### `sfdx jayree:org:configure`
 
@@ -535,7 +537,7 @@ EXAMPLES
   $ sfdx jayree:org:configure --concurrent --tasks="Asset Settings","Activity Settings"
 ```
 
-_See code: [src/commands/jayree/org/configure/index.ts](https://github.com/jayree/sfdx-jayree-plugin/blob/v4.4.38/src/commands/jayree/org/configure/index.ts)_
+_See code: [src/commands/jayree/org/configure/index.ts](https://github.com/jayree/sfdx-jayree-plugin/blob/v4.5.1/src/commands/jayree/org/configure/index.ts)_
 
 ### `sfdx jayree:org:configure:country`
 
@@ -559,7 +561,7 @@ DESCRIPTION
   update country integration values in the State/Country Picklists
 ```
 
-_See code: [src/commands/jayree/org/configure/country.ts](https://github.com/jayree/sfdx-jayree-plugin/blob/v4.4.38/src/commands/jayree/org/configure/country.ts)_
+_See code: [src/commands/jayree/org/configure/country.ts](https://github.com/jayree/sfdx-jayree-plugin/blob/v4.5.1/src/commands/jayree/org/configure/country.ts)_
 
 ### `sfdx jayree:org:configure:state`
 
@@ -588,7 +590,7 @@ DESCRIPTION
   import (create/update) states into the State/Country Picklists
 ```
 
-_See code: [src/commands/jayree/org/configure/state.ts](https://github.com/jayree/sfdx-jayree-plugin/blob/v4.4.38/src/commands/jayree/org/configure/state.ts)_
+_See code: [src/commands/jayree/org/configure/state.ts](https://github.com/jayree/sfdx-jayree-plugin/blob/v4.5.1/src/commands/jayree/org/configure/state.ts)_
 
 ### `sfdx jayree:org:settings`
 
@@ -621,7 +623,7 @@ EXAMPLES
   $ sfdx jayree:org:settings -u MyTestOrg1 -w
 ```
 
-_See code: [src/commands/jayree/org/settings.ts](https://github.com/jayree/sfdx-jayree-plugin/blob/v4.4.38/src/commands/jayree/org/settings.ts)_
+_See code: [src/commands/jayree/org/settings.ts](https://github.com/jayree/sfdx-jayree-plugin/blob/v4.5.1/src/commands/jayree/org/settings.ts)_
 
 ### `sfdx jayree:org:streaming`
 
@@ -650,7 +652,7 @@ EXAMPLES
   ...
 ```
 
-_See code: [src/commands/jayree/org/streaming.ts](https://github.com/jayree/sfdx-jayree-plugin/blob/v4.4.38/src/commands/jayree/org/streaming.ts)_
+_See code: [src/commands/jayree/org/streaming.ts](https://github.com/jayree/sfdx-jayree-plugin/blob/v4.5.1/src/commands/jayree/org/streaming.ts)_
 
 ### `sfdx jayree:packagedescription:create`
 
@@ -777,7 +779,41 @@ DESCRIPTION
   (examples will follow)
 ```
 
-_See code: [src/commands/jayree/source/fix.ts](https://github.com/jayree/sfdx-jayree-plugin/blob/v4.4.38/src/commands/jayree/source/fix.ts)_
+_See code: [src/commands/jayree/source/fix.ts](https://github.com/jayree/sfdx-jayree-plugin/blob/v4.5.1/src/commands/jayree/source/fix.ts)_
+
+### `sfdx jayree:source:snapshot:compare`
+
+compares sfdx source snapshot files
+
+```
+USAGE
+  $ sfdx jayree:source:snapshot:compare [--json] [--filepath <value>]
+
+FLAGS
+  --filepath=<value>  [default: ./sfdx-source-snapshot.json] path of the generated snapshot file
+
+GLOBAL FLAGS
+  --json  Format output as json.
+```
+
+_See code: [@jayree/sfdx-plugin-source](https://github.com/jayree/sfdx-plugin-source/blob/v1.0.5/src/commands/jayree/source/snapshot/compare.ts)_
+
+### `sfdx jayree:source:snapshot:generate`
+
+generates sfdx source snapshot files
+
+```
+USAGE
+  $ sfdx jayree:source:snapshot:generate [--json] [--filepath <value>]
+
+FLAGS
+  --filepath=<value>  [default: ./sfdx-source-snapshot.json] path to save the generated snapshot file
+
+GLOBAL FLAGS
+  --json  Format output as json.
+```
+
+_See code: [@jayree/sfdx-plugin-source](https://github.com/jayree/sfdx-plugin-source/blob/v1.0.5/src/commands/jayree/source/snapshot/generate.ts)_
 
 ### `sfdx jayree:source:tracking:list`
 
@@ -785,22 +821,15 @@ list changes in a scratch org by remote revision counter number
 
 ```
 USAGE
-  $ sfdx jayree:source:tracking:list [-r <integer>] [-u <string>] [--apiversion <string>] [--json] [--loglevel
-    trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]
+  $ sfdx jayree:source:tracking:list -o <value> [--json] [--api-version <value>] [-r <value>]
 
 FLAGS
-  -r, --revision=<value>                                                            start at a specific revision counter
-                                                                                    number
-  -u, --targetusername=<value>                                                      username or alias for the target
-                                                                                    org; overrides default target org
-  --apiversion=<value>                                                              override the api version used for
-                                                                                    api requests made by this command
-  --json                                                                            format output as json
-  --loglevel=(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)  [default: warn] logging level for
-                                                                                    this command invocation
+  -o, --target-org=<value>  (required) Username or alias of the target org.
+  -r, --revision=<value>    start at a specific revision counter number
+  --api-version=<value>     Override the api version used for api requests made by this command
 
-DESCRIPTION
-  list changes in a scratch org by remote revision counter number
+GLOBAL FLAGS
+  --json  Format output as json.
 
 EXAMPLES
   $ sfdx jayree:source:tracking:list
@@ -808,7 +837,7 @@ EXAMPLES
   $ sfdx jayree:source:tracking:list -u me@my.org -r 101
 ```
 
-_See code: [src/commands/jayree/source/tracking/list.ts](https://github.com/jayree/sfdx-jayree-plugin/blob/v4.4.38/src/commands/jayree/source/tracking/list.ts)_
+_See code: [@jayree/sfdx-plugin-source](https://github.com/jayree/sfdx-plugin-source/blob/v1.0.5/src/commands/jayree/source/tracking/list.ts)_
 
 ### `sfdx jayree:source:tracking:store:get`
 
@@ -816,27 +845,20 @@ get stored revision counter number
 
 ```
 USAGE
-  $ sfdx jayree:source:tracking:store:get [-u <string>] [--apiversion <string>] [--json] [--loglevel
-    trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]
+  $ sfdx jayree:source:tracking:store:get -o <value> [--json]
 
 FLAGS
-  -u, --targetusername=<value>                                                      username or alias for the target
-                                                                                    org; overrides default target org
-  --apiversion=<value>                                                              override the api version used for
-                                                                                    api requests made by this command
-  --json                                                                            format output as json
-  --loglevel=(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)  [default: warn] logging level for
-                                                                                    this command invocation
+  -o, --target-org=<value>  (required) Username or alias of the target org.
 
-DESCRIPTION
-  get stored revision counter number
+GLOBAL FLAGS
+  --json  Format output as json.
 
 EXAMPLES
   $ sfdx jayree:source:tracking:store:get
   $ sfdx jayree:source:tracking:store:get -u me@my.org
 ```
 
-_See code: [src/commands/jayree/source/tracking/store/get.ts](https://github.com/jayree/sfdx-jayree-plugin/blob/v4.4.38/src/commands/jayree/source/tracking/store/get.ts)_
+_See code: [@jayree/sfdx-plugin-source](https://github.com/jayree/sfdx-plugin-source/blob/v1.0.5/src/commands/jayree/source/tracking/store/get.ts)_
 
 ### `sfdx jayree:source:tracking:store:set`
 
@@ -844,22 +866,15 @@ store revision counter number
 
 ```
 USAGE
-  $ sfdx jayree:source:tracking:store:set [-r <integer>] [-u <string>] [--apiversion <string>] [--json] [--loglevel
-    trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]
+  $ sfdx jayree:source:tracking:store:set -o <value> [--json] [--api-version <value>] [-r <value>]
 
 FLAGS
-  -r, --revision=<value>                                                            revision counter number (default:
-                                                                                    remote revision counter number)
-  -u, --targetusername=<value>                                                      username or alias for the target
-                                                                                    org; overrides default target org
-  --apiversion=<value>                                                              override the api version used for
-                                                                                    api requests made by this command
-  --json                                                                            format output as json
-  --loglevel=(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)  [default: warn] logging level for
-                                                                                    this command invocation
+  -o, --target-org=<value>  (required) Username or alias of the target org.
+  -r, --revision=<value>    revision counter number (default: remote revision counter number)
+  --api-version=<value>     Override the api version used for api requests made by this command
 
-DESCRIPTION
-  store revision counter number
+GLOBAL FLAGS
+  --json  Format output as json.
 
 EXAMPLES
   $ sfdx jayree:source:tracking:store:set
@@ -867,7 +882,7 @@ EXAMPLES
   $ sfdx jayree:source:tracking:store:set -u MyTestOrg1 -r 101
 ```
 
-_See code: [src/commands/jayree/source/tracking/store/set.ts](https://github.com/jayree/sfdx-jayree-plugin/blob/v4.4.38/src/commands/jayree/source/tracking/store/set.ts)_
+_See code: [@jayree/sfdx-plugin-source](https://github.com/jayree/sfdx-plugin-source/blob/v1.0.5/src/commands/jayree/source/tracking/store/set.ts)_
 <!-- commandsstop -->
 
 ## Hooks

package/lib/commands/jayree/flowtestcoverage.js

@@ -14,7 +14,7 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('sfdx-jayree', 'flowtestcoverage');
-export default class FlowTestCoverage extends SfdxCommand {
+class FlowTestCoverage extends SfdxCommand {
     async run() {
         const conn = this.org.getConnection();
         const query1 = await conn.tooling.query("SELECT count_distinct(DefinitionId) FROM Flow WHERE Status = 'Active' AND(ProcessType = 'AutolaunchedFlow' OR ProcessType = 'Workflow' OR ProcessType = 'CustomEvent' OR ProcessType = 'InvocableProcess')");
@@ -67,4 +67,5 @@ Coverage: 82%
 FlowTestCoverage.requiresUsername = true;
 FlowTestCoverage.supportsDevhubUsername = false;
 FlowTestCoverage.requiresProject = false;
+export default FlowTestCoverage;
 //# sourceMappingURL=flowtestcoverage.js.map

package/lib/commands/jayree/flowtestcoverage.js.map

@@ -1 +1 @@
-{"version":3,"file":"flowtestcoverage.js","sourceRoot":"","sources":["../../../src/commands/jayree/flowtestcoverage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"flowtestcoverage.js","sourceRoot":"","sources":["../../../src/commands/jayree/flowtestcoverage.ts"],"names":[],"mappings":"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"}

package/lib/commands/jayree/org/configure/country.d.ts

@@ -1,5 +1,4 @@
 import { flags, SfdxCommand } from '@salesforce/command';
-import { AnyJson } from '@salesforce/ts-types';
 export default class UpdateCountry extends SfdxCommand {
     static description: string;
     protected static flagsConfig: {
@@ -8,5 +7,5 @@ export default class UpdateCountry extends SfdxCommand {
     protected static requiresUsername: boolean;
     protected static supportsDevhubUsername: boolean;
     protected static requiresProject: boolean;
-    run(): Promise<AnyJson>;
+    run(): Promise<void>;
 }

package/lib/commands/jayree/org/configure/country.js

@@ -9,9 +9,8 @@ import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { flags, SfdxCommand } from '@salesforce/command';
 import { Messages } from '@salesforce/core';
-import chalk from 'chalk';
-import { CliUx } from '@oclif/core';
-import puppeteer from 'puppeteer';
+import { ux } from '@oclif/core';
+import playwright from 'playwright-chromium';
 import { Tabletojson as tabletojson } from 'tabletojson';
 import config from '../../../../utils/config.js';
 const require = createRequire(import.meta.url);
@@ -22,11 +21,12 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('sfdx-jayree', 'createstatecountry');
-export default class UpdateCountry extends SfdxCommand {
+class UpdateCountry extends SfdxCommand {
     async run() {
         let spinnermessage = '';
-        const browser = await puppeteer.launch(config().puppeteer);
-        const page = await browser.newPage();
+        const browser = await playwright['chromium'].launch(config().puppeteer);
+        const context = await browser.newContext();
+        const page = await context.newPage();
         const setHTMLInputElementValue = async (newvalue, element) => {
             element = element.replace(/:/g, '\\:');
             const elementDisabled = await page.evaluate((s) => {
@@ -40,10 +40,10 @@ export default class UpdateCountry extends SfdxCommand {
             }, element);
             // const currentvalue = await page.evaluate(s => (document.querySelector(s) as HTMLInputElement).value, element);
             if (!elementDisabled) {
-                return page.evaluate((val, s) => (document.querySelector(s).value = val), newvalue, element);
+                return page.fill(element, newvalue);
             }
         };
-        const bar = CliUx.ux.progress({
+        const bar = ux.progress({
             barCompleteChar: '\u2588',
             barIncompleteChar: '\u2591',
             format: 'State and Country/Territory Picklist | [{bar}] {percentage}% | ETA: {eta}s | {value}/{total} | {text}',
@@ -60,16 +60,16 @@ export default class UpdateCountry extends SfdxCommand {
             // eslint-disable-next-line no-unused-expressions
             !this.flags.silent ? this.ux.setSpinnerStatus(spinnermessage) : process.stdout.write('.');
             await page.goto(conn.instanceUrl + '/secur/frontdoor.jsp?sid=' + conn.accessToken, {
-                waitUntil: 'networkidle0',
+                waitUntil: 'networkidle',
             });
             spinnermessage = 'retrieve list of countries';
             // eslint-disable-next-line no-unused-expressions
             !this.flags.silent ? this.ux.setSpinnerStatus(spinnermessage) : process.stdout.write('.');
             try {
                 await page.goto(conn.instanceUrl + '/i18n/ConfigStateCountry.apexp?setupid=AddressCleanerOverview', {
-                    waitUntil: 'networkidle0',
+                    waitUntil: 'networkidle',
                 });
-                await page.waitForSelector('.list', { visible: true });
+                await page.waitForSelector('.list', { state: 'visible' });
             }
             catch (error) {
                 throw Error("list of countries couldn't be loaded");
@@ -96,17 +96,20 @@ export default class UpdateCountry extends SfdxCommand {
                     })
                     : process.stdout.write('.');
                 await page.goto(conn.instanceUrl + `/i18n/ConfigureCountry.apexp?countryIso=${countryCode}&setupid=AddressCleanerOverview`, {
-                    waitUntil: 'networkidle0',
+                    waitUntil: 'networkidle',
                 });
                 const setCountrySelector = CSconfig.setCountry;
                 await setHTMLInputElementValue(countryCode, setCountrySelector.editIntVal);
                 await page.click(setCountrySelector.save.replace(/:/g, '\\:'));
-                await page.waitForNavigation({
-                    waitUntil: 'networkidle0',
-                });
+                await page.waitForSelector('.message.confirmM3', { state: 'visible' });
             }
         }
         catch (error) {
+            throw new Error(error.message);
+        }
+        finally {
+            // eslint-disable-next-line no-unused-expressions
+            !this.flags.silent ? bar.update(bar.getTotal(), { text: '' }) : process.stdout.write('.');
             this.ux.stopSpinner();
             bar.stop();
             if (page) {
@@ -115,19 +118,7 @@ export default class UpdateCountry extends SfdxCommand {
                     await browser.close();
                 }
             }
-            this.ux.error(chalk.bold('ERROR running jayree:automation:country:update:  ') + chalk.red(error.message));
-            process.exit(1);
-        }
-        // eslint-disable-next-line no-unused-expressions
-        !this.flags.silent ? bar.update(bar.getTotal(), { text: '' }) : process.stdout.write('.');
-        bar.stop();
-        if (page) {
-            await page.close();
-            if (browser) {
-                await browser.close();
-            }
         }
-        process.exit(0);
     }
 }
 UpdateCountry.description = messages.getMessage('commandCountryDescription');
@@ -142,4 +133,5 @@ UpdateCountry.flagsConfig = {
 UpdateCountry.requiresUsername = true;
 UpdateCountry.supportsDevhubUsername = false;
 UpdateCountry.requiresProject = false;
+export default UpdateCountry;
 //# sourceMappingURL=country.js.map

package/lib/commands/jayree/org/configure/country.js.map

@@ -1 +1 @@
-{"version":3,"file":"country.js","sourceRoot":"","sources":["../../../../../src/commands/jayree/org/configure/country.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"country.js","sourceRoot":"","sources":["../../../../../src/commands/jayree/org/configure/country.ts"],"names":[],"mappings":"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"}

package/lib/commands/jayree/org/configure/index.js

@@ -9,7 +9,7 @@ import { fileURLToPath } from 'node:url';
 import { flags, SfdxCommand } from '@salesforce/command';
 import { Messages } from '@salesforce/core';
 import { traverse } from '@salesforce/core/lib/util/internal.js';
-import { Logger, Listr } from 'listr2';
+import { ListrLogger, Listr, PRESET_TIMER } from 'listr2';
 import kit from '@salesforce/kit';
 import Debug from 'debug';
 import config from '../../../../utils/config.js';
@@ -20,9 +20,9 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('sfdx-jayree', 'configure');
-const logger = new Logger({ useIcons: false });
+const logger = new ListrLogger({ useIcons: false });
 const debug = Debug('jayree:org:configure');
-export default class ConfigureOrg extends SfdxCommand {
+class ConfigureOrg extends SfdxCommand {
     async run() {
         const isContentTypeJSON = kit.env.getString('SFDX_CONTENT_TYPE', '').toUpperCase() === 'JSON';
         this.isOutputEnabled = !(process.argv.find((arg) => arg === '--json') || isContentTypeJSON);
@@ -79,16 +79,23 @@ export default class ConfigureOrg extends SfdxCommand {
                 },
             },
         ], {
-            rendererOptions: { showTimer: true, collapseErrors: false, collapse: false },
-            rendererSilent: !this.isOutputEnabled,
-            rendererFallback: debug.enabled,
+            rendererOptions: {
+                timer: {
+                    ...PRESET_TIMER,
+                    condition: (duration) => duration > 250,
+                },
+                collapseErrors: false,
+                collapseSubtasks: false,
+            },
+            silentRendererCondition: !this.isOutputEnabled,
+            fallbackRendererCondition: debug.enabled,
             exitOnError: false,
         });
         try {
             const context = await mainTasks.run();
             if (debug.enabled) {
                 if (this.isOutputEnabled) {
-                    logger.success(`Context: ${JSON.stringify(context, null, 2)}`);
+                    logger.toStderr(`Context: ${JSON.stringify(context, null, 2)}`);
                 }
                 return context;
             }
@@ -98,7 +105,7 @@ export default class ConfigureOrg extends SfdxCommand {
         }
         catch (e) {
             if (this.isOutputEnabled) {
-                logger.fail(e);
+                logger.toStderr(e);
             }
             return { ...e };
         }
@@ -124,4 +131,5 @@ ConfigureOrg.flagsConfig = {
 ConfigureOrg.requiresUsername = true;
 ConfigureOrg.supportsDevhubUsername = false;
 ConfigureOrg.requiresProject = false;
+export default ConfigureOrg;
 //# sourceMappingURL=index.js.map

package/lib/commands/jayree/org/configure/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/commands/jayree/org/configure/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,uCAAuC,CAAC;AAEjE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,GAAG,MAAM,iBAAiB,CAAC;AAClC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,MAAM,MAAM,6BAA6B,CAAC;AACjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AAExF,gDAAgD;AAChD,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,gDAAgD;AAChD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEtC,QAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAE5C,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;AAEnE,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;AAE/C,MAAM,KAAK,GAAG,KAAK,CAAC,sBAAsB,CAAC,CAAC;AAE5C,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,WAAW;IA2B5C,KAAK,CAAC,GAAG;QACd,MAAM,iBAAiB,GAAG,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC;QAC9F,IAAI,CAAC,eAAe,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,QAAQ,CAAC,IAAI,iBAAiB,CAAC,CAAC;QAE5F,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QAC7B,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,mBAAmB,CAAC,CAAC;QAE9E,IAAI,QAAQ,GAAG,EAAE,CAAC;QAClB,IAAI,kBAAkB,GAAG,EAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;YACpB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAChC,kBAAkB,GAAG,kBAAkB,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;YAChH,CAAC,CAAC,CAAC;YACH,QAAQ,GAAG,kBAAkB,CAAC;SAC/B;aAAM;YACL,kBAAkB,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC;YACtF,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC;SAC1C;QAED,MAAM,eAAe,GAAG,IAAI,uBAAuB,CACjD;YACE,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,WAAW;YACjD,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,WAAW;SAClD,EACD,kBAAkB,CACnB,CAAC;QAEF,MAAM,UAAU,GAAG,IAAI,KAAK,CAAM,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;QAEjG,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;YACtB,UAAU,CAAC,GAAG,CAAC;gBACb,KAAK,EAAE,EAAE,CAAC,KAAK;gBACf,IAAI,EAAE,GAAY,EAAE,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACrD,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAiB,EAAE;oBACvC,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,EAAE,CAAC;oBACxC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE;wBAChC,IAAI,CAAC,IAAI,EAAE,CAAC;qBACb;gBACH,CAAC;gBACD,OAAO,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,EAAE;aACnD,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,IAAI,KAAK,CACzB;YACE;gBACE,KAAK,EAAE,cAAc;gBACrB,IAAI,EAAE,GAAY,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC;gBACrD,IAAI,EAAE,KAAK,IAAmB,EAAE;oBAC9B,MAAM,eAAe,CAAC,IAAI,EAAE,CAAC;gBAC/B,CAAC;aACF;YACD;gBACE,KAAK,EAAE,oBAAoB;gBAC3B,IAAI,EAAE,GAAY,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC;gBACrD,IAAI,EAAE,GAAU,EAAE,CAAC,UAAU;aAC9B;YACD;gBACE,KAAK,EAAE,eAAe;gBACtB,IAAI,EAAE,GAAY,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC;gBACrD,IAAI,EAAE,KAAK,IAAmB,EAAE;oBAC9B,MAAM,eAAe,CAAC,KAAK,EAAE,CAAC;gBAChC,CAAC;aACF;SACF,EACD;YACE,eAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE;YAC5E,cAAc,EAAE,CAAC,IAAI,CAAC,eAAe;YACrC,gBAAgB,EAAE,KAAK,CAAC,OAAO;YAC/B,WAAW,EAAE,KAAK;SACnB,CACF,CAAC;QAEF,IAAI;YACF,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,GAAG,EAAE,CAAC;YACtC,IAAI,KAAK,CAAC,OAAO,EAAE;gBACjB,IAAI,IAAI,CAAC,eAAe,EAAE;oBACxB,MAAM,CAAC,OAAO,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;iBAChE;gBACD,OAAO,OAA6B,CAAC;aACtC;YACD,OAAO;gBACL,OAAO;aACR,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,IAAI,CAAC,eAAe,EAAE;gBACxB,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aAChB;YACD,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC;SACjB;IACH,CAAC;;AApHa,wBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;AAExD,qBAAQ,GAAG;IACvB;;;sFAGkF;CACnF,CAAC;AAEe,wBAAW,GAAG;IAC7B,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC;QACjB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC;KAC1C,CAAC;IACF,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC;QACxB,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC;QAC9C,OAAO,EAAE,KAAK;KACf,CAAC;CACH,CAAC;AAEe,6BAAgB,GAAG,IAAI,CAAC;AACxB,mCAAsB,GAAG,KAAK,CAAC;AAC/B,4BAAe,GAAG,KAAK,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/commands/jayree/org/configure/index.ts"],"names":[],"mappings":"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"}