@salesforce/plugin-telemetry 3.1.3 → 3.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -154,12 +154,29 @@ export class CommandExecution extends AsyncCreatable {
154
154
  this.specifiedFlags.push(flagName);
155
155
  this.specifiedFlagFullNames.push(flagName);
156
156
  }
157
- else if (flagDefinitions[flagName].deprecateAliases) {
158
- // we can't find the flag as the key (long name) or short char, so it must be a deprecated flag
157
+ else {
158
+ // we can't find the flag as the key (long name) or short char, so it must be an alias
159
+ // get present flags in argv, that is everything starting with `-`, then strip dashes from it.
160
+ // e.g. ['-u', 'test', '--json'] -> [ 'u', undefined, 'json' ]
159
161
  const argvFlags = this.argv.map((a) => a.match(/-([a-zA-Z]+)/g)).map((a) => a?.[0].replace('-', ''));
160
- this.deprecatedFlagsUsed.push(flagDefinitions[flagName].aliases?.find((a) => argvFlags.includes(a)) ?? '');
161
- this.specifiedFlagFullNames.push(flagName);
162
- this.specifiedFlags.push(flagName);
162
+ let possibleAliases = flagDefinitions[flagName].aliases ?? [];
163
+ // charAliases is optional
164
+ // this check also ensure compatibility with commands using oclif/core < 3 where `charAliases` isn't supported.
165
+ if (flagDefinitions[flagName].charAliases) {
166
+ possibleAliases = possibleAliases?.concat(flagDefinitions[flagName].charAliases);
167
+ }
168
+ // if you have a flag that sets a default value and has aliases
169
+ // this check will ensure it only gets captured if the user specified it using aliases
170
+ const specifiedFlag = possibleAliases.find((a) => argvFlags.includes(a));
171
+ if (specifiedFlag) {
172
+ // save flag with their original name instead of the typed alias
173
+ this.specifiedFlagFullNames.push(flagName);
174
+ this.specifiedFlags.push(flagName);
175
+ // user typed a deprecated alias
176
+ if (flagDefinitions[flagName].deprecateAliases) {
177
+ this.deprecatedFlagsUsed.push(specifiedFlag);
178
+ }
179
+ }
163
180
  }
164
181
  });
165
182
  }
@@ -1 +1 @@
1
- {"version":3,"file":"commandExecution.js","sourceRoot":"","sources":["../src/commandExecution.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAmB,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAG7D,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAqB,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAatC,MAAM,OAAO,gBAAiB,SAAQ,cAAc;IAC3C,MAAM,CAAU;IACf,cAAc,GAAa,EAAE,CAAC;IAC9B,sBAAsB,GAAa,EAAE,CAAC;IACtC,mBAAmB,GAAa,EAAE,CAAC;IACnC,qBAAqB,CAAiB;IACtC,OAAO,CAAyB;IACvB,IAAI,CAAW;IACxB,MAAM,CAAkB;IAExB,KAAK,CAAiB;IACtB,QAAQ,CAAiB;IACzB,aAAa,CAAiB;IAC9B,gBAAgB,CAAiB;IAEzC,YAAmB,OAAgC;QACjD,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,cAAc;QAChC,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC;IAEM,MAAM;QACX,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QAExC,OAAO;YACL,SAAS,EAAE,mBAAmB;YAC9B,qBAAqB;YACrB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;YAC9B,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;YACxB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;YACtB,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;YAC7B,WAAW,EAAE,OAAO,CAAC,OAAO;YAC5B,aAAa,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI;YAEtC,kBAAkB;YAClB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;YAC5B,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;YAC5B,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;YAC3B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS;YAC7B,MAAM,EAAE,UAAU,CAAC,IAAI;YACvB,qCAAqC;YACrC,cAAc,EAAE,UAAU,CAAC,OAAO;YAClC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;YACxB,+CAA+C;YAC/C,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC;YAC7C,gDAAgD;YAChD,sBAAsB,EAAE,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC;YAC7D,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC;YACvD,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;YACjD,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;YAC7B,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;YACxC,mBAAmB,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YAClD,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;YAC3B,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;YAE7C,wBAAwB;YACxB,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YAC9B,wFAAwF;YACxF,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS;YAClE,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YAE7B,yBAAyB;YACzB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;SACxC,CAAC;IACJ,CAAC;IAEM,aAAa;QAClB,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI;YAC/B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO;SACtC,CAAC;IACJ,CAAC;IAEM,cAAc;QACnB,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;IACzB,CAAC;IAES,KAAK,CAAC,IAAI;QAClB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,MAAM,eAAe,GAAG;YACtB,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK;YACrB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS;YACzB,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAClE,CAAC;QAEF,gHAAgH;QAChH,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI;aAC9B,MAAM,CAAC,CAAC,CAAC;aACT,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;aACpC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEb,IACE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC;YACxC,CAAC,YAAY,KAAK,IAAI,CAAC,OAAO,CAAC,EAAE;gBAC/B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC;gBAC5C,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAChC;YACA,0FAA0F;YAC1F,gFAAgF;YAChF,IAAI,CAAC,qBAAqB,GAAG,YAAY,CAAC;SAC3C;QAED,IAAI,KAAK,GAAc,EAAE,CAAC;QAC1B,IAAI;YACF,KAAK,GAAG,CACN,MAAM,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE;gBACvB,KAAK,EAAE,eAAe;gBACtB,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;gBACvB,6EAA6E;gBAC7E,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO;aACrD,CAAC,CACH,CAAC,KAAK,CAAC;SACT;QAAC,OAAO,KAAK,EAAE;YACd,KAAK,CAAC,qBAAqB,CAAC,CAAC;SAC9B;QAED,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAE,KAAK,CAAC,YAAY,CAAoB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAC7F,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAE,KAAK,CAAC,gBAAgB,CAAoB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACxG,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC,YAAY,CAAC;YACtC,CAAC,CAAE,KAAK,CAAC,YAAY,CAAoB,CAAC,aAAa,EAAE,CAAC,aAAa,EAAE;YACzE,CAAC,CAAC,IAAI,CAAC;QACT,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC;YAC7C,CAAC,CAAE,KAAK,CAAC,gBAAgB,CAAoB,CAAC,aAAa,EAAE,CAAC,aAAa,EAAE;YAC7E,CAAC,CAAC,IAAI,CAAC;QACT,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC;IAC7D,CAAC;IAEO,uBAAuB,CAAC,IAAc,EAAE,KAAgB,EAAE,eAA0B;QAC1F,oCAAoC;QACpC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1D,IAAI,OAAO,CAAC,SAAS,CAAC,IAAI,QAAQ,EAAE;YAClC,IAAI,SAAS,EAAE;gBACb,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC/B;iBAAM;gBACL,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAClC;YACD,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACzC,kEAAkE;SACnE;aAAM;YACL,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACtC,MAAM,SAAS,GAAG,eAAe,CAAC,QAAQ,CAAC,IAAK,eAAe,CAAC,QAAQ,CAAC,CAAC,IAAe,CAAC;gBAC1F,uFAAuF;gBACvF,kDAAkD;gBAClD,IAAI,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,KAAK,SAAS,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE;oBAClF,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBACpC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAC5C;qBAAM,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,MAAM,QAAQ,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE;oBAC5E,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACnC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAC5C;qBAAM,IAAI,eAAe,CAAC,QAAQ,CAAC,CAAC,gBAAgB,EAAE;oBACrD,+FAA+F;oBAC/F,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;oBACrG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;oBAC3G,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBAC3C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBACpC;YACH,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;CACF"}
1
+ {"version":3,"file":"commandExecution.js","sourceRoot":"","sources":["../src/commandExecution.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { Hook } from '@oclif/core';
1
+ import type { Hook } from '@oclif/core';
2
2
  /**
3
3
  * A hook that runs before every command that:
4
4
  * 1. Warns the user about command usage data collection the CLI does unless they have already acknowledged the warning.
@@ -4,12 +4,7 @@
4
4
  * Licensed under the BSD 3-Clause license.
5
5
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
6
6
  */
7
- import { join } from 'node:path';
8
- import { Performance } from '@oclif/core';
9
- import { Lifecycle } from '@salesforce/core';
10
7
  import enabledCheck from '@salesforce/telemetry/enabledCheck';
11
- import Telemetry from '../telemetry.js';
12
- import { CommandExecution } from '../commandExecution.js';
13
8
  import { debug } from '../debugger.js';
14
9
  /**
15
10
  * A hook that runs before every command that:
@@ -24,6 +19,13 @@ const hook = async function (options) {
24
19
  return;
25
20
  }
26
21
  try {
22
+ const [path, Performance, Lifecycle, Telemetry, CommandExecution] = await Promise.all([
23
+ await import('node:path'),
24
+ (await import('@oclif/core')).Performance,
25
+ (await import('@salesforce/core')).Lifecycle,
26
+ (await import('../telemetry.js')).default,
27
+ (await import('../commandExecution.js')).CommandExecution,
28
+ ]);
27
29
  const errors = [];
28
30
  // Instantiating telemetry shows data collection warning.
29
31
  // Adding this to the global so that telemetry events are sent even when different
@@ -89,7 +91,8 @@ const hook = async function (options) {
89
91
  if (telemetry.firstRun) {
90
92
  telemetry.record({
91
93
  eventName: 'INSTALL',
92
- installType: this.config.binPath?.includes(join('sfdx', 'client')) ?? this.config.binPath?.includes(join('sf', 'client'))
94
+ installType: this.config.binPath?.includes(path.join('sfdx', 'client')) ??
95
+ this.config.binPath?.includes(path.join('sf', 'client'))
93
96
  ? 'installer'
94
97
  : 'npm',
95
98
  platform: this.config.platform,
@@ -1 +1 @@
1
- {"version":3,"file":"telemetryPrerun.js","sourceRoot":"","sources":["../../src/hooks/telemetryPrerun.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"telemetryPrerun.js","sourceRoot":"","sources":["../../src/hooks/telemetryPrerun.ts"],"names":[],"mappings":"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"}
package/oclif.lock CHANGED
@@ -794,7 +794,7 @@
794
794
  wordwrap "^1.0.0"
795
795
  wrap-ansi "^7.0.0"
796
796
 
797
- "@oclif/core@^3.0.4", "@oclif/core@^3.10.8", "@oclif/core@^3.11.0", "@oclif/core@^3.3.1", "@oclif/core@^3.5.0", "@oclif/core@^3.8.0":
797
+ "@oclif/core@^3.0.4", "@oclif/core@^3.11.0", "@oclif/core@^3.3.1", "@oclif/core@^3.5.0", "@oclif/core@^3.8.0":
798
798
  version "3.11.0"
799
799
  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-3.11.0.tgz#dadfac39238af3b717e33b910dde1f1f0fd2105e"
800
800
  integrity sha512-9A2LhDQATf1vrRqPoO0gGuBrey0jt3kDafC+eazxTNWV2EvlEpgY2587iyrxPK/fL2xg7f+0mtxYaSHdO2k8eg==
@@ -848,12 +848,12 @@
848
848
  dependencies:
849
849
  "@oclif/core" "^2.15.0"
850
850
 
851
- "@oclif/plugin-help@^6.0.6":
852
- version "6.0.6"
853
- resolved "https://registry.yarnpkg.com/@oclif/plugin-help/-/plugin-help-6.0.6.tgz#6bf150c5a2e68e65b89cd6edaa25017aca6d936d"
854
- integrity sha512-MBk0147mpub3NXKTqchjXon4ufhz8keDv9u2IlVKg4MfZSDesljEckot+MCgtDl5k24jCMubrkJQId1g5Ay70w==
851
+ "@oclif/plugin-help@^6.0.7":
852
+ version "6.0.7"
853
+ resolved "https://registry.yarnpkg.com/@oclif/plugin-help/-/plugin-help-6.0.7.tgz#0bad86335dbf687d0ba03c98f5e541109f9ac371"
854
+ integrity sha512-+apYpLuNk6VGNuZZbFdwUlTcFb+FkQnySWR5S5pZYC+yHcT39zgOK06NAheHHhd5KSzroFwQu7RTdHnK6Tzakg==
855
855
  dependencies:
856
- "@oclif/core" "^3.10.8"
856
+ "@oclif/core" "^3.11.0"
857
857
 
858
858
  "@oclif/plugin-not-found@^2.3.32":
859
859
  version "2.3.37"
@@ -1089,17 +1089,17 @@
1089
1089
  resolved "https://registry.yarnpkg.com/@salesforce/dev-config/-/dev-config-4.1.0.tgz#e529576466d074e7a5f1441236510fef123da01e"
1090
1090
  integrity sha512-2iDDepiIwjXHS5IVY7pwv8jMo4xWosJ7p/UTj+lllpB/gnJiYLhjJPE4Z3FCGFKyvfg5jGaimCd8Ca6bLGsCQA==
1091
1091
 
1092
- "@salesforce/dev-scripts@^7.1.1":
1093
- version "7.1.1"
1094
- resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-7.1.1.tgz#549b58fb7e8c2410ce594c46f780a0907618f19f"
1095
- integrity sha512-6SL+QDOMZCnmU4Lu2ZCjqsMRcHw96mnjUOPE7b2HcfmfPo2a/hAYUtv8v7UsZ/+3UPbSf+XsLJfUsF15QIUWrg==
1092
+ "@salesforce/dev-scripts@^8.0.0":
1093
+ version "8.0.0"
1094
+ resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-8.0.0.tgz#debdc8a311858259e7c972a55b82521c6eed101d"
1095
+ integrity sha512-8TxQD+8Acn1CBiiSwhTPnYfbdaX9fASUPB5CvTSQJMr9aitoa9PFrC/wE7QTmtf+O8UAAVz4nndhjVABqpYf1Q==
1096
1096
  dependencies:
1097
1097
  "@commitlint/cli" "^17.1.2"
1098
1098
  "@commitlint/config-conventional" "^17.1.0"
1099
1099
  "@salesforce/dev-config" "^4.1.0"
1100
1100
  "@salesforce/prettier-config" "^0.0.3"
1101
1101
  "@types/chai" "^4.3.10"
1102
- "@types/mocha" "^10.0.4"
1102
+ "@types/mocha" "^10.0.6"
1103
1103
  "@types/node" "^18"
1104
1104
  "@types/sinon" "^10.0.20"
1105
1105
  chai "^4.3.10"
@@ -1325,10 +1325,10 @@
1325
1325
  dependencies:
1326
1326
  "@types/node" "*"
1327
1327
 
1328
- "@types/debug@^4.1.8":
1329
- version "4.1.8"
1330
- resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.8.tgz#cef723a5d0a90990313faec2d1e22aee5eecb317"
1331
- integrity sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ==
1328
+ "@types/debug@^4.1.12":
1329
+ version "4.1.12"
1330
+ resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.12.tgz#a155f21690871953410df4b6b6f53187f0500917"
1331
+ integrity sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==
1332
1332
  dependencies:
1333
1333
  "@types/ms" "*"
1334
1334
 
@@ -1397,10 +1397,10 @@
1397
1397
  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.4.tgz#81f886786411c45bba3f33e781ab48bd56bfca2e"
1398
1398
  integrity sha512-Kfe/D3hxHTusnPNRbycJE1N77WHDsdS4AjUYIzlDzhDrS47NrwuL3YW4VITxwR7KCVpzwgy4Rbj829KSSQmwXQ==
1399
1399
 
1400
- "@types/mocha@^10.0.4":
1401
- version "10.0.4"
1402
- resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-10.0.4.tgz#b5331955ebca216604691fd4fcd2dbdc2bd559a4"
1403
- integrity sha512-xKU7bUjiFTIttpWaIZ9qvgg+22O1nmbA+HRxdlR+u6TWsGfmFdXrheJoK4fFxrHNVIOBDvDNKZG+LYBpMHpX3w==
1400
+ "@types/mocha@^10.0.6":
1401
+ version "10.0.6"
1402
+ resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-10.0.6.tgz#818551d39113081048bdddbef96701b4e8bb9d1b"
1403
+ integrity sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==
1404
1404
 
1405
1405
  "@types/ms@*":
1406
1406
  version "0.7.31"
@@ -5752,10 +5752,10 @@ object.values@^1.1.7:
5752
5752
  define-properties "^1.2.0"
5753
5753
  es-abstract "^1.22.1"
5754
5754
 
5755
- oclif@^4.0.3:
5756
- version "4.0.3"
5757
- resolved "https://registry.yarnpkg.com/oclif/-/oclif-4.0.3.tgz#2ff8fab10c29b2cd0bbf8e9c87640a64151b65ff"
5758
- integrity sha512-Bq7t1bJvAKYwW3DKQIzok3jkXv7yUIMneoSec1qUr9wfSqzRTZQB0UUDovwlT/L+3TBMVoRyw1WeX+YDvfRJNA==
5755
+ oclif@^4.0.4:
5756
+ version "4.0.4"
5757
+ resolved "https://registry.yarnpkg.com/oclif/-/oclif-4.0.4.tgz#ee05d5339fa1aad8fb6a303e53f4618feba86a5e"
5758
+ integrity sha512-2rebdu1Ow9/TRolMI7s1IsJmKH7RpwlBzIKZFtE8eFiDmGenX6GEsWaxSEtgMXmzCSSQ1DbCRDv0hwcwVGIJuA==
5759
5759
  dependencies:
5760
5760
  "@oclif/core" "^3.0.4"
5761
5761
  "@oclif/plugin-help" "^5.2.14"
@@ -34,5 +34,5 @@
34
34
  ]
35
35
  }
36
36
  },
37
- "version": "3.1.3"
37
+ "version": "3.1.5"
38
38
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@salesforce/plugin-telemetry",
3
3
  "description": "Command usage and error telemetry for the Salesforce CLI",
4
- "version": "3.1.3",
4
+ "version": "3.1.5",
5
5
  "author": "Salesforce",
6
6
  "bugs": "https://github.com/forcedotcom/cli/issues",
7
7
  "dependencies": {
@@ -13,13 +13,13 @@
13
13
  },
14
14
  "devDependencies": {
15
15
  "@oclif/plugin-command-snapshot": "^5.0.1",
16
- "@oclif/plugin-help": "^6.0.6",
16
+ "@oclif/plugin-help": "^6.0.7",
17
17
  "@salesforce/cli-plugins-testkit": "^5",
18
- "@salesforce/dev-scripts": "^7.1.1",
18
+ "@salesforce/dev-scripts": "^8.0.0",
19
19
  "@salesforce/plugin-command-reference": "^3.0.46",
20
20
  "@salesforce/ts-sinon": "^1.4.15",
21
- "@types/debug": "^4.1.8",
22
- "oclif": "^4.0.3",
21
+ "@types/debug": "^4.1.12",
22
+ "oclif": "^4.0.4",
23
23
  "shx": "0.3.4",
24
24
  "typescript": "^5.2.2"
25
25
  },
@@ -187,7 +187,7 @@
187
187
  "exports": "./lib/index.js",
188
188
  "type": "module",
189
189
  "sfdx": {
190
- "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/3.1.3.crt",
191
- "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/3.1.3.sig"
190
+ "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/3.1.5.crt",
191
+ "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-telemetry/3.1.5.sig"
192
192
  }
193
193
  }