@salesforce/plugin-lightning-dev 6.0.0 → 6.0.2-canary.0
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 +3 -3
- package/lib/commands/lightning/dev/app.d.ts +2 -1
- package/lib/commands/lightning/dev/app.js +19 -8
- package/lib/commands/lightning/dev/app.js.map +1 -1
- package/lib/commands/lightning/dev/component.js +2 -1
- package/lib/commands/lightning/dev/component.js.map +1 -1
- package/lib/commands/lightning/dev/site.js +12 -2
- package/lib/commands/lightning/dev/site.js.map +1 -1
- package/lib/configMeta.js +1 -1
- package/lib/configMeta.js.map +1 -1
- package/lib/lwc-dev-server/index.d.ts +3 -3
- package/lib/lwc-dev-server/index.js +13 -6
- package/lib/lwc-dev-server/index.js.map +1 -1
- package/lib/shared/configUtils.d.ts +1 -1
- package/lib/shared/configUtils.js +1 -1
- package/lib/shared/configUtils.js.map +1 -1
- package/lib/shared/dependencyLoader.d.ts +18 -0
- package/lib/shared/dependencyLoader.js +58 -0
- package/lib/shared/dependencyLoader.js.map +1 -0
- package/lib/shared/orgUtils.d.ts +4 -8
- package/lib/shared/orgUtils.js +4 -44
- package/lib/shared/orgUtils.js.map +1 -1
- package/lib/shared/previewUtils.d.ts +2 -2
- package/lib/shared/previewUtils.js +2 -4
- package/lib/shared/previewUtils.js.map +1 -1
- package/messages/shared.utils.md +4 -0
- package/npm-shrinkwrap.json +1788 -2564
- package/oclif.lock +2158 -2374
- package/oclif.manifest.json +1 -1
- package/package.json +20 -43
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/6.0.0/src/commands/lightning/dev/app.ts)_
|
|
204
|
+
_See code: [src/commands/lightning/dev/app.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/6.0.2-canary.0/src/commands/lightning/dev/app.ts)_
|
|
205
205
|
|
|
206
206
|
## `sf lightning dev component`
|
|
207
207
|
|
|
@@ -249,7 +249,7 @@ EXAMPLES
|
|
|
249
249
|
$ sf lightning dev component --name myComponent
|
|
250
250
|
```
|
|
251
251
|
|
|
252
|
-
_See code: [src/commands/lightning/dev/component.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/6.0.0/src/commands/lightning/dev/component.ts)_
|
|
252
|
+
_See code: [src/commands/lightning/dev/component.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/6.0.2-canary.0/src/commands/lightning/dev/component.ts)_
|
|
253
253
|
|
|
254
254
|
## `sf lightning dev site`
|
|
255
255
|
|
|
@@ -305,6 +305,6 @@ EXAMPLES
|
|
|
305
305
|
$ sf lightning dev site --name "Partner Central" --target-org myOrg --get-latest
|
|
306
306
|
```
|
|
307
307
|
|
|
308
|
-
_See code: [src/commands/lightning/dev/site.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/6.0.0/src/commands/lightning/dev/site.ts)_
|
|
308
|
+
_See code: [src/commands/lightning/dev/site.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/6.0.2-canary.0/src/commands/lightning/dev/site.ts)_
|
|
309
309
|
|
|
310
310
|
<!-- commandsstop -->
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Org } from '@salesforce/core';
|
|
1
2
|
import { AndroidAppPreviewConfig, IOSAppPreviewConfig, Platform } from '@salesforce/lwc-dev-mobile-core';
|
|
2
3
|
import { SfCommand } from '@salesforce/sf-plugins-core';
|
|
3
4
|
export declare const iOSSalesforceAppPreviewConfig: IOSAppPreviewConfig;
|
|
@@ -9,7 +10,7 @@ export default class LightningDevApp extends SfCommand<void> {
|
|
|
9
10
|
static readonly enableJsonFlag = false;
|
|
10
11
|
static readonly flags: {
|
|
11
12
|
name: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
12
|
-
'target-org': import("@oclif/core/interfaces").OptionFlag<
|
|
13
|
+
'target-org': import("@oclif/core/interfaces").OptionFlag<Org, import("@oclif/core/interfaces").CustomOptions>;
|
|
13
14
|
'device-type': import("@oclif/core/interfaces").OptionFlag<Platform | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
14
15
|
'device-id': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
15
16
|
};
|
|
@@ -20,6 +20,7 @@ import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
|
|
|
20
20
|
import { startLWCServer } from '../../../lwc-dev-server/index.js';
|
|
21
21
|
import { PreviewUtils } from '../../../shared/previewUtils.js';
|
|
22
22
|
import { PromptUtils } from '../../../shared/promptUtils.js';
|
|
23
|
+
import { MetaUtils } from '../../../shared/metaUtils.js';
|
|
23
24
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
24
25
|
const messages = Messages.loadMessages('@salesforce/plugin-lightning-dev', 'lightning.dev.app');
|
|
25
26
|
const sharedMessages = Messages.loadMessages('@salesforce/plugin-lightning-dev', 'shared.utils');
|
|
@@ -60,6 +61,16 @@ export default class LightningDevApp extends SfCommand {
|
|
|
60
61
|
const targetOrg = flags['target-org'];
|
|
61
62
|
const appName = flags['name'];
|
|
62
63
|
const deviceId = flags['device-id'];
|
|
64
|
+
// Auto enable local dev
|
|
65
|
+
if (process.env.AUTO_ENABLE_LOCAL_DEV === 'true') {
|
|
66
|
+
try {
|
|
67
|
+
await MetaUtils.ensureLightningPreviewEnabled(targetOrg.getConnection(undefined));
|
|
68
|
+
await MetaUtils.ensureFirstPartyCookiesNotRequired(targetOrg.getConnection(undefined));
|
|
69
|
+
}
|
|
70
|
+
catch (error) {
|
|
71
|
+
this.log('Error autoenabling local dev', error);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
63
74
|
let sfdxProjectRootPath = '';
|
|
64
75
|
try {
|
|
65
76
|
sfdxProjectRootPath = await SfProject.resolveProjectPath();
|
|
@@ -78,27 +89,27 @@ export default class LightningDevApp extends SfCommand {
|
|
|
78
89
|
const ldpServerUrl = PreviewUtils.generateWebSocketUrlForLocalDevServer(platform, serverPorts, logger);
|
|
79
90
|
logger.debug(`Local Dev Server url is ${ldpServerUrl}`);
|
|
80
91
|
if (platform === Platform.desktop) {
|
|
81
|
-
await this.desktopPreview(sfdxProjectRootPath, serverPorts, ldpServerToken, ldpServerId, ldpServerUrl, appId, logger);
|
|
92
|
+
await this.desktopPreview(targetOrg, sfdxProjectRootPath, serverPorts, ldpServerToken, ldpServerId, ldpServerUrl, appId, logger);
|
|
82
93
|
}
|
|
83
94
|
else {
|
|
84
|
-
await this.mobilePreview(platform, sfdxProjectRootPath, serverPorts, ldpServerToken, ldpServerId, ldpServerUrl, appName, appId, deviceId, logger);
|
|
95
|
+
await this.mobilePreview(targetOrg, platform, sfdxProjectRootPath, serverPorts, ldpServerToken, ldpServerId, ldpServerUrl, appName, appId, deviceId, logger);
|
|
85
96
|
}
|
|
86
97
|
}
|
|
87
|
-
async desktopPreview(sfdxProjectRootPath, serverPorts, ldpServerToken, ldpServerId, ldpServerUrl, appId, logger) {
|
|
98
|
+
async desktopPreview(org, sfdxProjectRootPath, serverPorts, ldpServerToken, ldpServerId, ldpServerUrl, appId, logger) {
|
|
88
99
|
if (!appId) {
|
|
89
100
|
logger.debug('No Lightning Experience application name provided.... using the default app instead.');
|
|
90
101
|
}
|
|
91
|
-
const
|
|
102
|
+
const targetOrgArg = PreviewUtils.getTargetOrgFromArguments(this.argv);
|
|
92
103
|
if (ldpServerUrl.startsWith('wss')) {
|
|
93
104
|
this.log(`\n${messages.getMessage('trust.local.dev.server')}`);
|
|
94
105
|
}
|
|
95
|
-
const launchArguments = PreviewUtils.generateDesktopPreviewLaunchArguments(ldpServerUrl, ldpServerId, appId,
|
|
106
|
+
const launchArguments = PreviewUtils.generateDesktopPreviewLaunchArguments(ldpServerUrl, ldpServerId, appId, targetOrgArg);
|
|
96
107
|
// Start the LWC Dev Server
|
|
97
|
-
await startLWCServer(logger, sfdxProjectRootPath, ldpServerToken, Platform.desktop, serverPorts);
|
|
108
|
+
await startLWCServer(logger, org.getConnection(undefined), sfdxProjectRootPath, ldpServerToken, Platform.desktop, serverPorts, undefined, undefined);
|
|
98
109
|
// Open the browser and navigate to the right page
|
|
99
110
|
await this.config.runCommand('org:open', launchArguments);
|
|
100
111
|
}
|
|
101
|
-
async mobilePreview(platform, sfdxProjectRootPath, serverPorts, ldpServerToken, ldpServerId, ldpServerUrl, appName, appId, deviceId, logger) {
|
|
112
|
+
async mobilePreview(org, platform, sfdxProjectRootPath, serverPorts, ldpServerToken, ldpServerId, ldpServerUrl, appName, appId, deviceId, logger) {
|
|
102
113
|
try {
|
|
103
114
|
// Verify that user environment is set up for mobile (i.e. has right tooling)
|
|
104
115
|
await this.verifyMobileRequirements(platform, logger);
|
|
@@ -174,7 +185,7 @@ export default class LightningDevApp extends SfCommand {
|
|
|
174
185
|
this.spinner.stop();
|
|
175
186
|
}
|
|
176
187
|
// Start the LWC Dev Server
|
|
177
|
-
await startLWCServer(logger, sfdxProjectRootPath, ldpServerToken, platform, serverPorts, certData);
|
|
188
|
+
await startLWCServer(logger, org.getConnection(undefined), sfdxProjectRootPath, ldpServerToken, platform, serverPorts, certData, undefined);
|
|
178
189
|
// Launch the native app for previewing (launchMobileApp will show its own spinner)
|
|
179
190
|
// eslint-disable-next-line camelcase
|
|
180
191
|
appConfig.launch_arguments = PreviewUtils.generateMobileAppPreviewLaunchArguments(ldpServerUrl, ldpServerId, appName, appId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../../../src/commands/lightning/dev/app.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../../../src/commands/lightning/dev/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -126,7 +126,8 @@ export default class LightningDevComponent extends SfCommand {
|
|
|
126
126
|
}
|
|
127
127
|
}
|
|
128
128
|
}
|
|
129
|
-
|
|
129
|
+
const conn = targetOrg.getConnection(apiVersion);
|
|
130
|
+
await startLWCServer(logger, conn, sfdxProjectRootPath, ldpServerToken, Platform.desktop, serverPorts, undefined, undefined);
|
|
130
131
|
const targetOrgArg = PreviewUtils.getTargetOrgFromArguments(this.argv);
|
|
131
132
|
const launchArguments = PreviewUtils.generateComponentPreviewLaunchArguments(ldpServerUrl, ldpServerId, componentName, targetOrgArg);
|
|
132
133
|
// Construct and log the full URL that will be opened
|
|
@@ -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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"}
|
|
@@ -24,6 +24,7 @@ import { PromptUtils } from '../../../shared/promptUtils.js';
|
|
|
24
24
|
import { ExperienceSite } from '../../../shared/experience/expSite.js';
|
|
25
25
|
import { PreviewUtils } from '../../../shared/previewUtils.js';
|
|
26
26
|
import { startLWCServer } from '../../../lwc-dev-server/index.js';
|
|
27
|
+
import { MetaUtils } from '../../../shared/metaUtils.js';
|
|
27
28
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
28
29
|
const messages = Messages.loadMessages('@salesforce/plugin-lightning-dev', 'lightning.dev.site');
|
|
29
30
|
const sharedMessages = Messages.loadMessages('@salesforce/plugin-lightning-dev', 'shared.utils');
|
|
@@ -60,11 +61,20 @@ export default class LightningDevSite extends SfCommand {
|
|
|
60
61
|
const ssr = flags.ssr;
|
|
61
62
|
let siteName = flags.name;
|
|
62
63
|
const connection = org.getConnection(undefined);
|
|
64
|
+
// Auto enable local dev
|
|
65
|
+
if (process.env.AUTO_ENABLE_LOCAL_DEV === 'true') {
|
|
66
|
+
try {
|
|
67
|
+
await MetaUtils.ensureLightningPreviewEnabled(connection);
|
|
68
|
+
await MetaUtils.ensureFirstPartyCookiesNotRequired(connection);
|
|
69
|
+
}
|
|
70
|
+
catch (error) {
|
|
71
|
+
this.log('Error autoenabling local dev', error);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
63
74
|
const localDevEnabled = await OrgUtils.isLocalDevEnabled(connection);
|
|
64
75
|
if (!localDevEnabled) {
|
|
65
76
|
throw new Error(sharedMessages.getMessage('error.localdev.not.enabled'));
|
|
66
77
|
}
|
|
67
|
-
OrgUtils.ensureMatchingAPIVersion(connection);
|
|
68
78
|
// If user doesn't specify a site, prompt the user for one
|
|
69
79
|
if (!siteName) {
|
|
70
80
|
const allSites = await ExperienceSite.getAllExpSites(org);
|
|
@@ -155,7 +165,7 @@ export default class LightningDevSite extends SfCommand {
|
|
|
155
165
|
const ldpServerUrl = PreviewUtils.generateWebSocketUrlForLocalDevServer(Platform.desktop, serverPorts);
|
|
156
166
|
this.log(`Local Dev Server url is ${ldpServerUrl}`);
|
|
157
167
|
const logger = await Logger.child(this.ctor.name);
|
|
158
|
-
await startLWCServer(logger, sfdxProjectRootPath, ldpServerToken, Platform.desktop, serverPorts);
|
|
168
|
+
await startLWCServer(logger, connection, sfdxProjectRootPath, ldpServerToken, Platform.desktop, serverPorts, undefined, undefined);
|
|
159
169
|
const url = new URL(previewUrl);
|
|
160
170
|
url.searchParams.set('aura.ldpServerUrl', ldpServerUrl);
|
|
161
171
|
url.searchParams.set('aura.ldpServerId', ldpServerId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"site.js","sourceRoot":"","sources":["../../../../src/commands/lightning/dev/site.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAc,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAwB,QAAQ,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"site.js","sourceRoot":"","sources":["../../../../src/commands/lightning/dev/site.ts"],"names":[],"mappings":"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"}
|
package/lib/configMeta.js
CHANGED
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import { Workspace } from '@lwc/
|
|
16
|
+
import { Workspace } from '@lwc/sfdx-local-dev-dist';
|
|
17
17
|
import { Messages } from '@salesforce/core';
|
|
18
18
|
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
19
19
|
const messages = Messages.loadMessages('@salesforce/plugin-lightning-dev', 'shared.utils');
|
package/lib/configMeta.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configMeta.js","sourceRoot":"","sources":["../src/configMeta.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"configMeta.js","sourceRoot":"","sources":["../src/configMeta.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAmC,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE7E,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,kCAAkC,EAAE,cAAc,CAAC,CAAC;AAC3F,MAAM,kBAAkB,GAAG,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC;AACzE,MAAM,0BAA0B,GAAG,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC;AACjF,MAAM,mCAAmC,GAAG,QAAQ,CAAC,UAAU,CAAC,iCAAiC,CAAC,CAAC;AACnG,MAAM,0BAA0B,GAAG,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC;AACjF,MAAM,mCAAmC,GAAG,QAAQ,CAAC,UAAU,CAAC,iCAAiC,CAAC,CAAC;AACnG,MAAM,+BAA+B,GAAG,QAAQ,CAAC,UAAU,CAAC,6BAA6B,CAAC,CAAC;AAC3F,MAAM,wCAAwC,GAAG,QAAQ,CAAC,UAAU,CAAC,sCAAsC,CAAC,CAAC;AAgC7G,eAAe;IACb;QACE,GAAG,kFAA2C;QAC9C,WAAW,EAAE,kBAAkB;QAC/B,MAAM,EAAE,IAAI;QACZ,SAAS,EAAE,IAAI;KAChB;IACD;QACE,GAAG,uFAA6C;QAChD,WAAW,EAAE,0BAA0B;QACvC,KAAK,EAAE;YACL,SAAS,EAAE,CAAC,KAAkB,EAAW,EAAE;gBACzC,MAAM,IAAI,GAAG,KAAqC,CAAC;gBACnD,IAAI,CAAC,IAAI,EAAE,cAAc,IAAI,CAAC,IAAI,EAAE,cAAc,IAAI,CAAC,IAAI,EAAE,aAAa,EAAE,CAAC;oBAC3E,OAAO,KAAK,CAAC;gBACf,CAAC;gBAED,OAAO,IAAI,CAAC;YACd,CAAC;YACD,aAAa,EAAE,mCAAmC;SACnD;KACF;IACD;QACE,GAAG,gEAAkC;QACrC,WAAW,EAAE,0BAA0B;QACvC,KAAK,EAAE;YACL,SAAS,EAAE,CAAC,KAAkB,EAAW,EAAE;gBACzC,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,OAAO,KAAK,CAAC;gBACf,CAAC;gBAED,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAe,EAAE,EAAE,CAAC,CAAC;gBAEjD,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,UAAU,GAAG,CAAC,IAAI,UAAU,GAAG,MAAM,EAAE,CAAC;oBAC/D,OAAO,KAAK,CAAC;gBACf,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YACD,aAAa,EAAE,mCAAmC;SACnD;KACF;IACD;QACE,GAAG,0EAAuC;QAC1C,WAAW,EAAE,+BAA+B;QAC5C,KAAK,EAAE;YACL,SAAS,EAAE,CAAC,KAAkB,EAAW,EAAE;gBACzC,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,OAAO,KAAK,CAAC;gBACf,CAAC;gBAED,MAAM,SAAS,GAAG,KAAkB,CAAC;gBAErC,IAAI,SAAS,KAAK,SAAS,CAAC,KAAK,IAAI,SAAS,KAAK,SAAS,CAAC,GAAG,EAAE,CAAC;oBACjE,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC;YACD,aAAa,EAAE,wCAAwC;SACxD;KACF;CACsB,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { LWCServer, Workspace } from '@lwc/
|
|
2
|
-
import { Logger } from '@salesforce/core';
|
|
1
|
+
import type { LWCServer, Workspace } from '@lwc/sfdx-local-dev-dist';
|
|
2
|
+
import { Connection, Logger } from '@salesforce/core';
|
|
3
3
|
import { SSLCertificateData } from '@salesforce/lwc-dev-mobile-core';
|
|
4
|
-
export declare function startLWCServer(logger: Logger, rootDir: string, token: string, clientType: string, serverPorts?: {
|
|
4
|
+
export declare function startLWCServer(logger: Logger, connection: Connection, rootDir: string, token: string, clientType: string, serverPorts?: {
|
|
5
5
|
httpPort: number;
|
|
6
6
|
httpsPort: number;
|
|
7
7
|
}, certData?: SSLCertificateData, workspace?: Workspace): Promise<LWCServer>;
|
|
@@ -14,9 +14,9 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import process from 'node:process';
|
|
17
|
-
import { startLwcDevServer } from '@lwc/lwc-dev-server';
|
|
18
17
|
import { Lifecycle, SfProject } from '@salesforce/core';
|
|
19
18
|
import { glob } from 'glob';
|
|
19
|
+
import { loadLwcModule } from '../shared/dependencyLoader.js';
|
|
20
20
|
import { ConfigUtils, LOCAL_DEV_SERVER_DEFAULT_HTTP_PORT, LOCAL_DEV_SERVER_DEFAULT_WORKSPACE, } from '../shared/configUtils.js';
|
|
21
21
|
async function createLWCServerConfig(rootDir, token, clientType, serverPorts, certData, workspace) {
|
|
22
22
|
const project = await SfProject.resolve();
|
|
@@ -30,36 +30,43 @@ async function createLWCServerConfig(rootDir, token, clientType, serverPorts, ce
|
|
|
30
30
|
httpPort: LOCAL_DEV_SERVER_DEFAULT_HTTP_PORT,
|
|
31
31
|
httpsPort: LOCAL_DEV_SERVER_DEFAULT_HTTP_PORT + 1,
|
|
32
32
|
};
|
|
33
|
+
const resolvedWorkspace = (workspace ??
|
|
34
|
+
(await ConfigUtils.getLocalDevServerWorkspace()) ??
|
|
35
|
+
LOCAL_DEV_SERVER_DEFAULT_WORKSPACE);
|
|
33
36
|
const serverConfig = {
|
|
34
37
|
rootDir,
|
|
35
38
|
// use custom port if any is provided, or fetch from config file (if any), otherwise use the default port
|
|
36
39
|
port: ports.httpPort,
|
|
37
40
|
paths: namespacePaths,
|
|
38
41
|
// use custom workspace if any is provided, or fetch from config file (if any), otherwise use the default workspace
|
|
39
|
-
workspace:
|
|
42
|
+
workspace: resolvedWorkspace,
|
|
40
43
|
identityToken: token,
|
|
41
44
|
lifecycle: Lifecycle.getInstance(),
|
|
42
45
|
clientType,
|
|
43
46
|
namespace: typeof namespace === 'string' && namespace.trim().length > 0 ? namespace.trim() : undefined,
|
|
44
47
|
};
|
|
45
48
|
if (certData?.pemCertificate && certData.pemPrivateKey) {
|
|
46
|
-
|
|
49
|
+
const httpsConfig = {
|
|
47
50
|
cert: certData.pemCertificate,
|
|
48
51
|
key: certData.pemPrivateKey,
|
|
49
52
|
port: ports.httpsPort,
|
|
50
53
|
};
|
|
54
|
+
serverConfig.https = httpsConfig;
|
|
51
55
|
}
|
|
52
56
|
return serverConfig;
|
|
53
57
|
}
|
|
54
|
-
export async function startLWCServer(logger, rootDir, token, clientType, serverPorts, certData, workspace) {
|
|
58
|
+
export async function startLWCServer(logger, connection, rootDir, token, clientType, serverPorts, certData, workspace) {
|
|
59
|
+
const orgApiVersion = connection.version;
|
|
60
|
+
logger.trace(`Starting LWC server for org API version: ${orgApiVersion}`);
|
|
61
|
+
const lwcDevServerModule = await loadLwcModule(orgApiVersion);
|
|
55
62
|
const config = await createLWCServerConfig(rootDir, token, clientType, serverPorts, certData, workspace);
|
|
56
63
|
logger.trace(`Starting LWC Dev Server with config: ${JSON.stringify(config)}`);
|
|
57
|
-
|
|
64
|
+
const lwcDevServerResult = await lwcDevServerModule.startLwcDevServer(config, logger);
|
|
65
|
+
const lwcDevServer = lwcDevServerResult;
|
|
58
66
|
const cleanup = () => {
|
|
59
67
|
if (lwcDevServer) {
|
|
60
68
|
logger.trace('Stopping LWC Dev Server');
|
|
61
69
|
lwcDevServer.stopServer();
|
|
62
|
-
lwcDevServer = null;
|
|
63
70
|
}
|
|
64
71
|
};
|
|
65
72
|
[
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lwc-dev-server/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,OAAO,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lwc-dev-server/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Workspace } from '@lwc/
|
|
1
|
+
import { Workspace } from '@lwc/sfdx-local-dev-dist';
|
|
2
2
|
import { SSLCertificateData } from '@salesforce/lwc-dev-mobile-core';
|
|
3
3
|
import { Config } from '@salesforce/core';
|
|
4
4
|
export declare const LOCAL_DEV_SERVER_DEFAULT_HTTP_PORT = 8081;
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import { Workspace } from '@lwc/
|
|
16
|
+
import { Workspace } from '@lwc/sfdx-local-dev-dist';
|
|
17
17
|
import { Config, ConfigAggregator } from '@salesforce/core';
|
|
18
18
|
import configMeta from './../configMeta.js';
|
|
19
19
|
export const LOCAL_DEV_SERVER_DEFAULT_HTTP_PORT = 8081;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configUtils.js","sourceRoot":"","sources":["../../src/shared/configUtils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"configUtils.js","sourceRoot":"","sources":["../../src/shared/configUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { Logger } from '@salesforce/core';
|
|
2
|
+
/**
|
|
3
|
+
* Type for dynamically loaded LWC module from @lwc/sfdx-local-dev-dist
|
|
4
|
+
*/
|
|
5
|
+
export type LwcModule = {
|
|
6
|
+
[key: string]: unknown;
|
|
7
|
+
startLwcDevServer: (config: unknown, logger: Logger) => Promise<unknown>;
|
|
8
|
+
LWCServer: unknown;
|
|
9
|
+
Workspace: unknown;
|
|
10
|
+
};
|
|
11
|
+
/**
|
|
12
|
+
* Loads the LWC module for the specified org API version
|
|
13
|
+
* Uses dynamic import to load the aliased package at runtime
|
|
14
|
+
*
|
|
15
|
+
* @param orgApiVersion - The API version from the org (e.g., '65.0.1')
|
|
16
|
+
* @returns The loaded module from @lwc/sfdx-local-dev-dist
|
|
17
|
+
*/
|
|
18
|
+
export declare function loadLwcModule(orgApiVersion: string): Promise<LwcModule>;
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright 2026, Salesforce, Inc.
|
|
3
|
+
*
|
|
4
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
5
|
+
* you may not use this file except in compliance with the License.
|
|
6
|
+
* You may obtain a copy of the License at
|
|
7
|
+
*
|
|
8
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
9
|
+
*
|
|
10
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
11
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
12
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
13
|
+
* See the License for the specific language governing permissions and
|
|
14
|
+
* limitations under the License.
|
|
15
|
+
*/
|
|
16
|
+
import packageJsonImport from '../../package.json' with { type: 'json' };
|
|
17
|
+
const packageJson = packageJsonImport;
|
|
18
|
+
/**
|
|
19
|
+
* Returns a formatted list of all supported API versions
|
|
20
|
+
*/
|
|
21
|
+
function getSupportedVersionsList() {
|
|
22
|
+
return Object.keys(packageJson.apiVersionMetadata).sort().join(', ');
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* Given an org API version, returns the matched supported version string
|
|
26
|
+
*
|
|
27
|
+
* @param orgApiVersion - The API version from the org (e.g., "65.0")
|
|
28
|
+
* @returns The matched version string (e.g., "65.0")
|
|
29
|
+
* @throws Error if the API version is not supported
|
|
30
|
+
*/
|
|
31
|
+
function resolveApiVersion(orgApiVersion) {
|
|
32
|
+
const metadata = packageJson.apiVersionMetadata;
|
|
33
|
+
// Exact match
|
|
34
|
+
if (metadata[orgApiVersion]) {
|
|
35
|
+
return orgApiVersion;
|
|
36
|
+
}
|
|
37
|
+
throw new Error(`Unsupported org API version: ${orgApiVersion}. This plugin supports: ${getSupportedVersionsList()}`);
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* Loads the LWC module for the specified org API version
|
|
41
|
+
* Uses dynamic import to load the aliased package at runtime
|
|
42
|
+
*
|
|
43
|
+
* @param orgApiVersion - The API version from the org (e.g., '65.0.1')
|
|
44
|
+
* @returns The loaded module from @lwc/sfdx-local-dev-dist
|
|
45
|
+
*/
|
|
46
|
+
export async function loadLwcModule(orgApiVersion) {
|
|
47
|
+
const version = resolveApiVersion(orgApiVersion);
|
|
48
|
+
const packageName = `@lwc/sfdx-local-dev-dist-${version}`;
|
|
49
|
+
try {
|
|
50
|
+
return (await import(packageName));
|
|
51
|
+
}
|
|
52
|
+
catch (error) {
|
|
53
|
+
throw new Error(`Failed to load LWC module for version '${version}'. ` +
|
|
54
|
+
`Package '${packageName}' could not be imported. ` +
|
|
55
|
+
`Error: ${error instanceof Error ? error.message : String(error)}`);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
//# sourceMappingURL=dependencyLoader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dependencyLoader.js","sourceRoot":"","sources":["../../src/shared/dependencyLoader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,iBAAiB,MAAM,oBAAoB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAC;AAMzE,MAAM,WAAW,GAAG,iBAA2C,CAAC;AAYhE;;GAEG;AACH,SAAS,wBAAwB;IAC/B,OAAO,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACvE,CAAC;AAED;;;;;;GAMG;AACH,SAAS,iBAAiB,CAAC,aAAqB;IAC9C,MAAM,QAAQ,GAAG,WAAW,CAAC,kBAAkB,CAAC;IAEhD,cAAc;IACd,IAAI,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QAC5B,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,gCAAgC,aAAa,2BAA2B,wBAAwB,EAAE,EAAE,CAAC,CAAC;AACxH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,aAAqB;IACvD,MAAM,OAAO,GAAG,iBAAiB,CAAC,aAAa,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,4BAA4B,OAAO,EAAE,CAAC;IAE1D,IAAI,CAAC;QACH,OAAO,CAAC,MAAM,MAAM,CAAC,WAAW,CAAC,CAAc,CAAC;IAClD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,0CAA0C,OAAO,KAAK;YACpD,YAAY,WAAW,2BAA2B;YAClD,UAAU,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CACrE,CAAC;IACJ,CAAC;AACH,CAAC"}
|
package/lib/shared/orgUtils.d.ts
CHANGED
|
@@ -5,6 +5,10 @@ export type AppDefinition = {
|
|
|
5
5
|
Description: string;
|
|
6
6
|
DurableId: string;
|
|
7
7
|
};
|
|
8
|
+
/**
|
|
9
|
+
* As we go through different phases of release cycles, in order to ensure that the API version supported by
|
|
10
|
+
* the local dev server matches with Org API versions, we rely on defining a metadata section in package.json
|
|
11
|
+
*/
|
|
8
12
|
export declare class OrgUtils {
|
|
9
13
|
/**
|
|
10
14
|
* Given an app name, it queries the AppDefinition table in the org to find
|
|
@@ -40,12 +44,4 @@ export declare class OrgUtils {
|
|
|
40
44
|
* @returns the id of the saved record
|
|
41
45
|
*/
|
|
42
46
|
static saveAppServerIdentityToken(connection: Connection, token: string): Promise<string>;
|
|
43
|
-
/**
|
|
44
|
-
* Given a connection to an Org, it ensures that org API version matches what the local dev server expects.
|
|
45
|
-
* To do this, it compares the org API version with the meta data stored in package.json under apiVersionMetadata.
|
|
46
|
-
* If the API versions do not match then this method will throw an exception.
|
|
47
|
-
*
|
|
48
|
-
* @param connection the connection to the org
|
|
49
|
-
*/
|
|
50
|
-
static ensureMatchingAPIVersion(connection: Connection): void;
|
|
51
47
|
}
|
package/lib/shared/orgUtils.js
CHANGED
|
@@ -13,12 +13,10 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
21
|
-
const messages = Messages.loadMessages('@salesforce/plugin-lightning-dev', 'shared.utils');
|
|
16
|
+
/**
|
|
17
|
+
* As we go through different phases of release cycles, in order to ensure that the API version supported by
|
|
18
|
+
* the local dev server matches with Org API versions, we rely on defining a metadata section in package.json
|
|
19
|
+
*/
|
|
22
20
|
export class OrgUtils {
|
|
23
21
|
/**
|
|
24
22
|
* Given an app name, it queries the AppDefinition table in the org to find
|
|
@@ -100,43 +98,5 @@ export class OrgUtils {
|
|
|
100
98
|
}
|
|
101
99
|
throw new Error('Could not save the app server identity token to the org.');
|
|
102
100
|
}
|
|
103
|
-
/**
|
|
104
|
-
* Given a connection to an Org, it ensures that org API version matches what the local dev server expects.
|
|
105
|
-
* To do this, it compares the org API version with the meta data stored in package.json under apiVersionMetadata.
|
|
106
|
-
* If the API versions do not match then this method will throw an exception.
|
|
107
|
-
*
|
|
108
|
-
* @param connection the connection to the org
|
|
109
|
-
*/
|
|
110
|
-
static ensureMatchingAPIVersion(connection) {
|
|
111
|
-
// Testing purposes only - using this flag may cause local development to not function correctly
|
|
112
|
-
if (process.env.SKIP_API_VERSION_CHECK === 'true') {
|
|
113
|
-
return;
|
|
114
|
-
}
|
|
115
|
-
const dirname = path.dirname(url.fileURLToPath(import.meta.url));
|
|
116
|
-
const packageJsonFilePath = path.resolve(dirname, '../../package.json');
|
|
117
|
-
const pkg = CommonUtils.loadJsonFromFile(packageJsonFilePath);
|
|
118
|
-
const targetVersion = pkg.apiVersionMetadata.target.versionNumber;
|
|
119
|
-
const orgVersion = connection.version;
|
|
120
|
-
if (Version.same(orgVersion, targetVersion) === false) {
|
|
121
|
-
let errorMessage = messages.getMessage('error.org.api-mismatch.message', [orgVersion, targetVersion]);
|
|
122
|
-
// Find the tag (if any) that can support this org version
|
|
123
|
-
const tagName = pkg.apiVersionMetadata.versionToTagMappings.find((info) => info.versionNumber === orgVersion)?.tagName;
|
|
124
|
-
if (tagName) {
|
|
125
|
-
const remediation = messages.getMessage('error.org.api-mismatch.remediation', [
|
|
126
|
-
tagName,
|
|
127
|
-
`${pkg.name}@${tagName}`,
|
|
128
|
-
]);
|
|
129
|
-
errorMessage = `${errorMessage} ${remediation}`;
|
|
130
|
-
}
|
|
131
|
-
// Examples of error messages are as below (where the tag name comes from apiVersionMetadata in package.json):
|
|
132
|
-
//
|
|
133
|
-
// Your org is on API version 61.0, but this version of the CLI plugin supports API version 62.0. To use the plugin with this org, you can reinstall or update the plugin using the "latest" tag. For example: "sf plugins install @salesforce/plugin-lightning-dev@latest".
|
|
134
|
-
//
|
|
135
|
-
// Your org is on API version 62.0, but this version of the CLI plugin supports API version 63.0. To use the plugin with this org, you can reinstall or update the plugin using the "next" tag. For example: "sf plugins install @salesforce/plugin-lightning-dev@next".
|
|
136
|
-
//
|
|
137
|
-
// Your org is on API version 63.0, but this version of the CLI plugin supports API version 62.0. To use the plugin with this org, you can reinstall or update the plugin using the "latest" tag. For example: "sf plugins install @salesforce/plugin-lightning-dev@latest".
|
|
138
|
-
throw new Error(errorMessage);
|
|
139
|
-
}
|
|
140
|
-
}
|
|
141
101
|
}
|
|
142
102
|
//# sourceMappingURL=orgUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orgUtils.js","sourceRoot":"","sources":["../../src/shared/orgUtils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;
|
|
1
|
+
{"version":3,"file":"orgUtils.js","sourceRoot":"","sources":["../../src/shared/orgUtils.ts"],"names":[],"mappings":"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"}
|