@salesforce/plugin-lightning-dev 3.2.8 → 3.2.10

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.
package/README.md CHANGED
@@ -201,7 +201,7 @@ EXAMPLES
201
201
  $ sf lightning dev app --target-org myOrg --device-type ios --device-id "iPhone 15 Pro Max"
202
202
  ```
203
203
 
204
- _See code: [src/commands/lightning/dev/app.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/3.2.8/src/commands/lightning/dev/app.ts)_
204
+ _See code: [src/commands/lightning/dev/app.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/3.2.10/src/commands/lightning/dev/app.ts)_
205
205
 
206
206
  ## `sf lightning dev component`
207
207
 
@@ -246,7 +246,7 @@ EXAMPLES
246
246
  $ sf lightning dev component --name myComponent
247
247
  ```
248
248
 
249
- _See code: [src/commands/lightning/dev/component.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/3.2.8/src/commands/lightning/dev/component.ts)_
249
+ _See code: [src/commands/lightning/dev/component.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/3.2.10/src/commands/lightning/dev/component.ts)_
250
250
 
251
251
  ## `sf lightning dev site`
252
252
 
@@ -300,6 +300,6 @@ EXAMPLES
300
300
  $ sf lightning dev site --name "Partner Central" --target-org myOrg --get-latest
301
301
  ```
302
302
 
303
- _See code: [src/commands/lightning/dev/site.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/3.2.8/src/commands/lightning/dev/site.ts)_
303
+ _See code: [src/commands/lightning/dev/site.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/3.2.10/src/commands/lightning/dev/site.ts)_
304
304
 
305
305
  <!-- commandsstop -->
@@ -5,6 +5,7 @@
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
7
  import path from 'node:path';
8
+ import url from 'node:url';
8
9
  import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
9
10
  import { Messages, SfProject } from '@salesforce/core';
10
11
  import { cmpDev } from '@lwrjs/api';
@@ -57,9 +58,11 @@ export default class LightningDevComponent extends SfCommand {
57
58
  let name = flags.name;
58
59
  if (name) {
59
60
  // validate that the component exists before launching the server
60
- if (!components.find((component) => name === component.name)) {
61
+ const match = components.find((component) => name === component.name || name === component.label);
62
+ if (!match) {
61
63
  throw new Error(messages.getMessage('error.component-not-found', [name]));
62
64
  }
65
+ name = match.name;
63
66
  }
64
67
  else {
65
68
  // prompt the user for a name if one was not provided
@@ -68,11 +71,15 @@ export default class LightningDevComponent extends SfCommand {
68
71
  throw new Error(messages.getMessage('error.component'));
69
72
  }
70
73
  }
74
+ const dirname = path.dirname(url.fileURLToPath(import.meta.url));
75
+ const rootDir = path.resolve(dirname, '../../../..');
71
76
  const port = parseInt(process.env.PORT ?? '3000', 10);
72
77
  await cmpDev({
78
+ rootDir,
73
79
  mode: 'dev',
74
80
  port,
75
81
  name: `c/${name}`,
82
+ namespacePaths,
76
83
  });
77
84
  }
78
85
  }
@@ -1 +1 @@
1
- {"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../src/commands/lightning/dev/component.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../src/commands/lightning/dev/component.ts"],"names":[],"mappings":"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"}
@@ -12,4 +12,5 @@ export declare class ComponentUtils {
12
12
  static getComponentPaths(namespacePath: string): Promise<string[]>;
13
13
  static getComponentMetadata(dirname: string): Promise<LwcMetadata | undefined>;
14
14
  private static isLwcMetadata;
15
+ private static normalizeMetaProperty;
15
16
  }
@@ -37,10 +37,23 @@ export class ComponentUtils {
37
37
  if (!this.isLwcMetadata(parsedData)) {
38
38
  return undefined;
39
39
  }
40
+ if (parsedData.LightningComponentBundle) {
41
+ parsedData.LightningComponentBundle.masterLabel = this.normalizeMetaProperty(parsedData.LightningComponentBundle.masterLabel);
42
+ parsedData.LightningComponentBundle.description = this.normalizeMetaProperty(parsedData.LightningComponentBundle.description);
43
+ }
40
44
  return parsedData;
41
45
  }
42
46
  static isLwcMetadata(obj) {
43
47
  return (obj && typeof obj === 'object' && 'LightningComponentBundle' in obj) === true;
44
48
  }
49
+ static normalizeMetaProperty(prop) {
50
+ if (!prop || typeof prop === 'string') {
51
+ return prop;
52
+ }
53
+ if (Array.isArray(prop) && prop.length > 0) {
54
+ return prop[0];
55
+ }
56
+ return undefined;
57
+ }
45
58
  }
46
59
  //# sourceMappingURL=componentUtils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"componentUtils.js","sourceRoot":"","sources":["../../src/shared/componentUtils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAU5C,MAAM,OAAO,cAAc;IAClB,MAAM,CAAC,wBAAwB,CAAC,aAAqB;QAC1D,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,aAAa,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;IAC5F,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,OAAkB;QACtD,MAAM,WAAW,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;QAEpD,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,QAAQ,SAAS,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAClH,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,cAAwB;QAC/D,OAAO,CACL,MAAM,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,cAAc,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC,CAAC,CAC1G,CAAC,IAAI,EAAE,CAAC;IACX,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,aAAqB;QACzD,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QAEnF,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IACjH,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,OAAe;QACtD,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC7C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,aAAa,cAAc,CAAC,CAAC;QACvE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YAChC,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACnE,MAAM,UAAU,GAAG,CAAC,MAAM,kBAAkB,CAAC,UAAU,CAAC,CAAgB,CAAC;QACzE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;YACpC,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,MAAM,CAAC,aAAa,CAAC,GAAY;QACvC,OAAO,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,0BAA0B,IAAI,GAAG,CAAC,KAAK,IAAI,CAAC;IACxF,CAAC;CACF"}
1
+ {"version":3,"file":"componentUtils.js","sourceRoot":"","sources":["../../src/shared/componentUtils.ts"],"names":[],"mappings":"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"}
@@ -110,7 +110,8 @@ export class OrgUtils {
110
110
  const orgVersion = connection.version;
111
111
  if (Version.same(orgVersion, targetVersion) === false) {
112
112
  let errorMessage = messages.getMessage('error.org.api-mismatch.message', [orgVersion, targetVersion]);
113
- const tagName = pkg.apiVersionMetadata.versionToTagMappings.find((info) => info.versionNumber === targetVersion)?.tagName;
113
+ // Find the tag (if any) that can support this org version
114
+ const tagName = pkg.apiVersionMetadata.versionToTagMappings.find((info) => info.versionNumber === orgVersion)?.tagName;
114
115
  if (tagName) {
115
116
  const remediation = messages.getMessage('error.org.api-mismatch.remediation', [
116
117
  tagName,
@@ -1 +1 @@
1
- {"version":3,"file":"orgUtils.js","sourceRoot":"","sources":["../../src/shared/orgUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"orgUtils.js","sourceRoot":"","sources":["../../src/shared/orgUtils.ts"],"names":[],"mappings":"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"}