Merge remote-tracking branch 'origin/main' into abdulsattar/dual-version

Author: abdulsattar

CHANGELOG.md

@@ -1,3 +1,57 @@
+# [6.1.0](https://github.com/salesforcecli/plugin-lightning-dev/compare/6.0.9...6.1.0) (2026-01-28)
+
+### Features
+
+- prompt to enable local dev @W-20406426 [#595](https://github.com/salesforcecli/plugin-lightning-dev/issues/595) ([#597](https://github.com/salesforcecli/plugin-lightning-dev/issues/597)) ([a653742](https://github.com/salesforcecli/plugin-lightning-dev/commit/a653742c8864fa3cfe73dff1cdc39de594163684))
+
+## [6.0.9](https://github.com/salesforcecli/plugin-lightning-dev/compare/6.0.8...6.0.9) (2026-01-25)
+
+### Bug Fixes
+
+- **deps:** bump the lwc-packages group with 3 updates ([#604](https://github.com/salesforcecli/plugin-lightning-dev/issues/604)) ([00ec369](https://github.com/salesforcecli/plugin-lightning-dev/commit/00ec369fb1cf4fa9f73637e28dc44e3584b12c15))
+
+## [6.0.8](https://github.com/salesforcecli/plugin-lightning-dev/compare/6.0.7...6.0.8) (2026-01-25)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/core from 8.24.3 to 8.25.0 ([#605](https://github.com/salesforcecli/plugin-lightning-dev/issues/605)) ([d02eaeb](https://github.com/salesforcecli/plugin-lightning-dev/commit/d02eaebc189366302a78dc36d06ddf78d3efa1fd))
+
+## [6.0.7](https://github.com/salesforcecli/plugin-lightning-dev/compare/6.0.6...6.0.7) (2026-01-25)
+
+### Bug Fixes
+
+- **deps:** bump @lwrjs/api from 0.21.4 to 0.21.5 ([#606](https://github.com/salesforcecli/plugin-lightning-dev/issues/606)) ([02237da](https://github.com/salesforcecli/plugin-lightning-dev/commit/02237da03567c9ebc59517d8bdcf4d822fafd207))
+
+## [6.0.6](https://github.com/salesforcecli/plugin-lightning-dev/compare/6.0.5...6.0.6) (2026-01-23)
+
+### Bug Fixes
+
+- **deps:** bump lodash from 4.17.21 to 4.17.23 ([#603](https://github.com/salesforcecli/plugin-lightning-dev/issues/603)) ([8c249f3](https://github.com/salesforcecli/plugin-lightning-dev/commit/8c249f3cb0de287b7d87d330e60441cf8089be5c))
+
+## [6.0.5](https://github.com/salesforcecli/plugin-lightning-dev/compare/6.0.4...6.0.5) (2026-01-18)
+
+### Bug Fixes
+
+- **deps:** bump the lwc-packages group with 3 updates ([#599](https://github.com/salesforcecli/plugin-lightning-dev/issues/599)) ([93715b9](https://github.com/salesforcecli/plugin-lightning-dev/commit/93715b9b927f7cec07094e725bd1f75c5421a9a4))
+
+## [6.0.4](https://github.com/salesforcecli/plugin-lightning-dev/compare/6.0.3...6.0.4) (2026-01-18)
+
+### Bug Fixes
+
+- **deps:** bump @lwrjs/api from 0.18.3 to 0.21.4 ([#600](https://github.com/salesforcecli/plugin-lightning-dev/issues/600)) ([e355c75](https://github.com/salesforcecli/plugin-lightning-dev/commit/e355c751681f35f2d1e9ecae8c555ed0d61d5f63))
+
+## [6.0.3](https://github.com/salesforcecli/plugin-lightning-dev/compare/6.0.2...6.0.3) (2026-01-18)
+
+### Bug Fixes
+
+- **deps:** bump @salesforce/core from 8.24.0 to 8.24.3 ([#601](https://github.com/salesforcecli/plugin-lightning-dev/issues/601)) ([ee11b80](https://github.com/salesforcecli/plugin-lightning-dev/commit/ee11b8060e760850be260e829825664373bd08ae))
+
+## [6.0.2](https://github.com/salesforcecli/plugin-lightning-dev/compare/6.0.1...6.0.2) (2026-01-15)
+
+### Bug Fixes
+
+- **deps:** bump undici from 6.21.2 to 6.23.0 ([#598](https://github.com/salesforcecli/plugin-lightning-dev/issues/598)) ([d08a87d](https://github.com/salesforcecli/plugin-lightning-dev/commit/d08a87daad7f516c70398fdb50a8fb27b34aa75c))
+
 ## [6.0.1](https://github.com/salesforcecli/plugin-lightning-dev/compare/6.0.0...6.0.1) (2026-01-10)
 
 ### Bug Fixes

README.md

@@ -150,6 +150,7 @@ Preview a Lightning Experience app locally and in real-time, without deploying i
 ```
 USAGE
   $ sf lightning dev app -o <value> [--flags-dir <value>] [-n <value>] [-t desktop|ios|android] [-i <value>]
+    [--api-version <value>]
 
 FLAGS
   -i, --device-id=<value>     ID of the mobile device to display the preview if device type is set to `ios` or
@@ -159,6 +160,7 @@ FLAGS
                               configuration variable is already set.
   -t, --device-type=<option>  Type of device to display the app preview.
                               <options: desktop|ios|android>
+      --api-version=<value>   Override the api version used for api requests made by this command
 
 GLOBAL FLAGS
   --flags-dir=<value>  Import flag values from a directory.
@@ -201,7 +203,7 @@ EXAMPLES
     $ sf lightning dev app --target-org myOrg --device-type ios --device-id "iPhone 15 Pro Max"
 ```
 
-_See code: [src/commands/lightning/dev/app.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/6.0.2-canary.1/src/commands/lightning/dev/app.ts)_
+_See code: [src/commands/lightning/dev/app.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/6.1.0/src/commands/lightning/dev/app.ts)_
 
 ## `sf lightning dev component`
 
@@ -249,25 +251,26 @@ EXAMPLES
     $ sf lightning dev component --name myComponent
 ```
 
-_See code: [src/commands/lightning/dev/component.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/6.0.2-canary.1/src/commands/lightning/dev/component.ts)_
+_See code: [src/commands/lightning/dev/component.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/6.1.0/src/commands/lightning/dev/component.ts)_
 
 ## `sf lightning dev site`
 
 [Beta] Preview an Experience Builder site locally and in real-time, without deploying it.
 
 ```
 USAGE
-  $ sf lightning dev site -o <value> [--flags-dir <value>] [-n <value>] [-l] [--guest] [--ssr]
+  $ sf lightning dev site -o <value> [--flags-dir <value>] [-n <value>] [-l] [--guest] [--ssr] [--api-version <value>]
 
 FLAGS
-  -l, --get-latest          Download the latest version of the specified site from your org, instead of using any local
-                            cache.
-  -n, --name=<value>        Name of the Experience Builder site to preview. It has to match a site name from the current
-                            org.
-  -o, --target-org=<value>  (required) Username or alias of the target org. Not required if the `target-org`
-                            configuration variable is already set.
-      --guest               Preview the site as a guest user (rather than an authenticated user).
-      --ssr                 Preview the SSR bundle
+  -l, --get-latest           Download the latest version of the specified site from your org, instead of using any local
+                             cache.
+  -n, --name=<value>         Name of the Experience Builder site to preview. It has to match a site name from the
+                             current org.
+  -o, --target-org=<value>   (required) Username or alias of the target org. Not required if the `target-org`
+                             configuration variable is already set.
+      --api-version=<value>  Override the api version used for api requests made by this command
+      --guest                Preview the site as a guest user (rather than an authenticated user).
+      --ssr                  Preview the SSR bundle
 
 GLOBAL FLAGS
   --flags-dir=<value>  Import flag values from a directory.
@@ -305,6 +308,6 @@ EXAMPLES
     $ sf lightning dev site --name "Partner Central" --target-org myOrg --get-latest
 ```
 
-_See code: [src/commands/lightning/dev/site.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/6.0.2-canary.1/src/commands/lightning/dev/site.ts)_
+_See code: [src/commands/lightning/dev/site.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/6.1.0/src/commands/lightning/dev/site.ts)_
 
 <!-- commandsstop -->

command-snapshot.json

@@ -4,7 +4,7 @@
     "command": "lightning:dev:app",
     "flagAliases": [],
     "flagChars": ["i", "n", "o", "t"],
-    "flags": ["device-id", "device-type", "flags-dir", "name", "target-org"],
+    "flags": ["api-version", "device-id", "device-type", "flags-dir", "name", "target-org"],
     "plugin": "@salesforce/plugin-lightning-dev"
   },
   {
@@ -20,7 +20,7 @@
     "command": "lightning:dev:site",
     "flagAliases": [],
     "flagChars": ["l", "n", "o"],
-    "flags": ["flags-dir", "get-latest", "guest", "name", "ssr", "target-org"],
+    "flags": ["api-version", "flags-dir", "get-latest", "guest", "name", "ssr", "target-org"],
     "plugin": "@salesforce/plugin-lightning-dev"
   }
 ]

messages/prompts.md

@@ -37,3 +37,7 @@ Unable to enumerate a list of available devices.
 # component.select
 
 Which Lightning Web Component would you like to preview (Use arrow keys)
+
+# component.enable-local-dev
+
+Local Dev isn't enabled for this org. Enable it?

messages/shared.utils.md

@@ -26,6 +26,10 @@ The SSL certificate data to be used by the local dev server for secure connectio
 
 You must provide valid SSL certificate data
 
+# localdev.enabled
+
+Local dev has been enabled for this org.
+
 # error.localdev.not.enabled
 
 Local Dev is not enabled for your org. See https://developer.salesforce.com/docs/platform/lwc/guide/get-started-test-components.html for more information on enabling and using Local Dev.

package.json

@@ -11,14 +11,15 @@
     "@lwc/sfdx-local-dev-dist-65.0": "npm:@lwc/sfdx-local-dev-dist@~13.1.7",
     "@lwc/sfdx-local-dev-dist-66.0": "npm:@lwc/sfdx-local-dev-dist@~13.2.22",
     "@lwc/sfdx-local-dev-dist-67.0": "npm:@lwc/sfdx-local-dev-dist@~13.3.18",
-    "@lwrjs/api": "0.18.3",
+    "@lwrjs/api": "0.21.5",
     "@oclif/core": "^4.5.6",
-    "@salesforce/core": "^8.24.0",
+    "@salesforce/core": "^8.25.0",
     "@salesforce/kit": "^3.2.4",
     "@salesforce/lwc-dev-mobile-core": "4.0.0-alpha.14",
     "@salesforce/sf-plugins-core": "^11.2.4",
     "axios": "^1.13.2",
     "glob": "^13.0.0",
+    "lwc": "~8.28.2",
     "node-fetch": "^3.3.2",
     "open": "^10.2.0",
     "xml2js": "^0.6.2"
@@ -39,7 +40,7 @@
     "eslint-plugin-sf-plugin": "^1.20.33",
     "eslint-plugin-unicorn": "^50.0.1",
     "esmock": "^2.7.3",
-    "oclif": "^4.22.63",
+    "oclif": "^4.22.68",
     "ts-node": "^10.9.2",
     "typescript": "^5.5.4"
   },

src/commands/lightning/dev/app.ts

@@ -69,6 +69,7 @@ export default class LightningDevApp extends SfCommand<void> {
       summary: messages.getMessage('flags.device-id.summary'),
       char: 'i',
     }),
+    'api-version': Flags.orgApiVersion(),
   };
 
   public async run(): Promise<void> {
@@ -78,16 +79,7 @@ export default class LightningDevApp extends SfCommand<void> {
     const targetOrg = flags['target-org'];
     const appName = flags['name'];
     const deviceId = flags['device-id'];
-
-    // Auto enable local dev
-    if (process.env.AUTO_ENABLE_LOCAL_DEV === 'true') {
-      try {
-        await MetaUtils.ensureLightningPreviewEnabled(targetOrg.getConnection(undefined));
-        await MetaUtils.ensureFirstPartyCookiesNotRequired(targetOrg.getConnection(undefined));
-      } catch (error) {
-        this.log('Error autoenabling local dev', error);
-      }
-    }
+    const apiVersion = flags['api-version'];
 
     let sfdxProjectRootPath = '';
     try {
@@ -97,7 +89,14 @@ export default class LightningDevApp extends SfCommand<void> {
     }
 
     logger.debug('Initalizing preview connection and configuring local web server identity');
-    const { connection, ldpServerId, ldpServerToken } = await PreviewUtils.initializePreviewConnection(targetOrg);
+
+    const connection = targetOrg.getConnection(apiVersion);
+
+    if (await MetaUtils.handleLocalDevEnablement(connection)) {
+      this.log(sharedMessages.getMessage('localdev.enabled'));
+    }
+
+    const { ldpServerId, ldpServerToken } = await PreviewUtils.initializePreviewConnection(connection);
 
     const platform = flags['device-type'] ?? (await PromptUtils.promptUserToSelectPlatform());
 

src/commands/lightning/dev/component.ts

@@ -75,17 +75,13 @@ export default class LightningDevComponent extends SfCommand<ComponentPreviewRes
     const targetOrg = flags['target-org'];
     const apiVersion = flags['api-version'];
 
-    // Auto enable local dev
-    if (process.env.AUTO_ENABLE_LOCAL_DEV === 'true') {
-      try {
-        await MetaUtils.ensureLightningPreviewEnabled(targetOrg.getConnection(undefined));
-        await MetaUtils.ensureFirstPartyCookiesNotRequired(targetOrg.getConnection(undefined));
-      } catch (error) {
-        this.log('Error autoenabling local dev', error);
-      }
+    const connection = targetOrg.getConnection(apiVersion);
+
+    if (await MetaUtils.handleLocalDevEnablement(connection)) {
+      this.log(sharedMessages.getMessage('localdev.enabled'));
     }
 
-    const { ldpServerId, ldpServerToken } = await PreviewUtils.initializePreviewConnection(targetOrg);
+    const { ldpServerId, ldpServerToken } = await PreviewUtils.initializePreviewConnection(connection);
 
     logger.debug('Determining the next available port for Local Dev Server');
     const serverPorts = await PreviewUtils.getNextAvailablePorts();
@@ -182,9 +178,6 @@ export default class LightningDevComponent extends SfCommand<ComponentPreviewRes
       targetOrgArg,
     );
 
-    // Construct and log the full URL that will be opened
-    const connection = targetOrg.getConnection(apiVersion);
-
     // strip trailing slashes
     const instanceUrl = connection.instanceUrl.replace(/\/$/, '');
 

src/commands/lightning/dev/site.ts

@@ -19,7 +19,6 @@ import { Connection, Logger, Messages, SfProject } from '@salesforce/core';
 import { Platform } from '@salesforce/lwc-dev-mobile-core';
 import { expDev, SitesLocalDevOptions, setupDev } from '@lwrjs/api';
 import open from 'open';
-import { OrgUtils } from '../../../shared/orgUtils.js';
 import { PromptUtils } from '../../../shared/promptUtils.js';
 import { ExperienceSite } from '../../../shared/experience/expSite.js';
 import { PreviewUtils } from '../../../shared/previewUtils.js';
@@ -54,6 +53,7 @@ export default class LightningDevSite extends SfCommand<void> {
       summary: messages.getMessage('flags.ssr.summary'),
       default: false,
     }),
+    'api-version': Flags.orgApiVersion(),
   };
 
   public async run(): Promise<void> {
@@ -62,25 +62,15 @@ export default class LightningDevSite extends SfCommand<void> {
     try {
       const org = flags['target-org'];
       const getLatest = flags['get-latest'];
+      const apiVersion = flags['api-version'];
       const guest = flags.guest;
       const ssr = flags.ssr;
       let siteName = flags.name;
 
-      const connection = org.getConnection(undefined);
+      const connection = org.getConnection(apiVersion);
 
-      // Auto enable local dev
-      if (process.env.AUTO_ENABLE_LOCAL_DEV === 'true') {
-        try {
-          await MetaUtils.ensureLightningPreviewEnabled(connection);
-          await MetaUtils.ensureFirstPartyCookiesNotRequired(connection);
-        } catch (error) {
-          this.log('Error autoenabling local dev', error);
-        }
-      }
-
-      const localDevEnabled = await OrgUtils.isLocalDevEnabled(connection);
-      if (!localDevEnabled) {
-        throw new Error(sharedMessages.getMessage('error.localdev.not.enabled'));
+      if (await MetaUtils.handleLocalDevEnablement(connection)) {
+        this.log(sharedMessages.getMessage('localdev.enabled'));
       }
 
       // If user doesn't specify a site, prompt the user for one