Revert "chore: resolve merge conflicts and update dependencies"

This reverts commit 08c566e, reversing
changes made to 827868a.

Author: lesya7

.husky/check-versions.js

@@ -1,24 +1,23 @@
 import fs from 'node:fs';
-import semver from 'semver';
 
 // Read package.json
 const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8'));
 
 // Extract versions
 const devServerDependencyVersion = packageJson.dependencies['@lwc/lwc-dev-server'];
-const devServerTargetVersionRange = packageJson.apiVersionMetadata?.target?.matchingDevServerVersion;
+const devServerTargetVersion = packageJson.apiVersionMetadata?.target?.matchingDevServerVersion;
 
-if (!devServerDependencyVersion || !devServerTargetVersionRange) {
+if (!devServerDependencyVersion || !devServerTargetVersion) {
   console.error('Error: missing @lwc/lwc-dev-server or matchingDevServerVersion');
   process.exit(1); // Fail the check
 }
 
 // Compare versions
-if (semver.intersects(devServerTargetVersionRange, devServerDependencyVersion)) {
+if (devServerDependencyVersion === devServerTargetVersion) {
   process.exit(0); // Pass the check
 } else {
   console.error(
-    `Error: @lwc/lwc-dev-server versions do not match between 'dependencies' and 'apiVersionMetadata' in package.json. Expected ${devServerDependencyVersion} in apiVersionMetadata > target > matchingDevServerVersion. Got ${devServerTargetVersionRange} instead. When updating the @lwc/lwc-dev-server dependency, you must ensure that it is compatible with the supported API version in this branch, then update apiVersionMetadata > target > matchingDevServerVersion to match, in order to "sign off" on this dependency change.`
+    `Error: @lwc/lwc-dev-server versions do not match between 'dependencies' and 'apiVersionMetadata' in package.json. Expected ${devServerDependencyVersion} in apiVersionMetadata > target > matchingDevServerVersion. Got ${devServerTargetVersion} instead. When updating the @lwc/lwc-dev-server dependency, you must ensure that it is compatible with the supported API version in this branch, then update apiVersionMetadata > target > matchingDevServerVersion to match, in order to "sign off" on this dependency change.`
   );
   process.exit(1); // Fail the check
 }

CHANGELOG.md

@@ -1,57 +1,3 @@
-# [4.3.0](https://github.com/salesforcecli/plugin-lightning-dev/compare/4.2.0...4.3.0) (2025-07-11)
-
-### Features
-
-- move component preview to org ([#447](https://github.com/salesforcecli/plugin-lightning-dev/issues/447)) ([2d9fb17](https://github.com/salesforcecli/plugin-lightning-dev/commit/2d9fb17e09a5fb68356e688335180e36d3a4f1dc))
-
-# [4.2.0](https://github.com/salesforcecli/plugin-lightning-dev/compare/4.1.7...4.2.0) (2025-07-11)
-
-### Features
-
-- launch site preview @W-18283821 ([#449](https://github.com/salesforcecli/plugin-lightning-dev/issues/449)) ([b8a8844](https://github.com/salesforcecli/plugin-lightning-dev/commit/b8a884405214e79d6d7186d89b658bee447a7cd7))
-
-## [4.1.7](https://github.com/salesforcecli/plugin-lightning-dev/compare/4.1.6...4.1.7) (2025-07-09)
-
-### Bug Fixes
-
-- bump LWC to 13.0.29 @W-18283826 ([#448](https://github.com/salesforcecli/plugin-lightning-dev/issues/448)) ([e40b7fc](https://github.com/salesforcecli/plugin-lightning-dev/commit/e40b7fcdf33ecd1e6f89240eb9e44f568afba6e9))
-
-## [4.1.6](https://github.com/salesforcecli/plugin-lightning-dev/compare/4.1.5...4.1.6) (2025-07-08)
-
-### Bug Fixes
-
-- bump LWC @W-18283826 ([#446](https://github.com/salesforcecli/plugin-lightning-dev/issues/446)) ([d161c35](https://github.com/salesforcecli/plugin-lightning-dev/commit/d161c351842926b12c472ab8d5e5c73219360958))
-
-## [4.1.5](https://github.com/salesforcecli/plugin-lightning-dev/compare/4.1.4...4.1.5) (2025-07-07)
-
-### Bug Fixes
-
-- eccn compliance ([#441](https://github.com/salesforcecli/plugin-lightning-dev/issues/441)) ([3c8dd4b](https://github.com/salesforcecli/plugin-lightning-dev/commit/3c8dd4b5baffaa5569d6fab6f98483842ddd0acc))
-
-## [4.1.4](https://github.com/salesforcecli/plugin-lightning-dev/compare/4.1.3...4.1.4) (2025-07-06)
-
-### Bug Fixes
-
-- **deps:** bump @oclif/core from 4.4.0 to 4.4.1 ([#442](https://github.com/salesforcecli/plugin-lightning-dev/issues/442)) ([08a1b88](https://github.com/salesforcecli/plugin-lightning-dev/commit/08a1b8892c0ca10e6e8c1bb0e32f28342ab72e9f))
-
-## [4.1.3](https://github.com/salesforcecli/plugin-lightning-dev/compare/4.1.2...4.1.3) (2025-07-06)
-
-### Bug Fixes
-
-- **deps:** bump lwc from 8.20.0 to 8.20.1 ([#444](https://github.com/salesforcecli/plugin-lightning-dev/issues/444)) ([4d9624f](https://github.com/salesforcecli/plugin-lightning-dev/commit/4d9624fb4a9b764cbb5a195c30c6ac2b6ec5f6df))
-
-## [4.1.2](https://github.com/salesforcecli/plugin-lightning-dev/compare/4.1.1...4.1.2) (2025-06-29)
-
-### Bug Fixes
-
-- **deps:** bump axios from 1.8.2 to 1.10.0 ([#437](https://github.com/salesforcecli/plugin-lightning-dev/issues/437)) ([571499d](https://github.com/salesforcecli/plugin-lightning-dev/commit/571499d0f9901049b045450d8003d3ec9bf58dd3))
-
-## [4.1.1](https://github.com/salesforcecli/plugin-lightning-dev/compare/4.1.0...4.1.1) (2025-06-29)
-
-### Bug Fixes
-
-- **deps:** bump @salesforce/core from 8.14.0 to 8.15.0 ([#438](https://github.com/salesforcecli/plugin-lightning-dev/issues/438)) ([ca23095](https://github.com/salesforcecli/plugin-lightning-dev/commit/ca23095e4214c29d12d4521433db16310050c41c))
-
 # [4.1.0](https://github.com/salesforcecli/plugin-lightning-dev/compare/4.0.5...4.1.0) (2025-06-27)
 
 ### Features

CODEOWNERS

@@ -1,4 +1,4 @@
 # Comment line immediately above ownership line is reserved for related other information. Please be careful while editing.
 
-#GUSINFO: Web Application Runtime, LWR CLI and Local Development
+#GUSINFO: Web Application Runtime, Lightning Web Runtime (Container)
 * @salesforcecli/lwr @salesforcecli/lex @salesforcecli/mobile-platform-experience

README.md

@@ -201,21 +201,20 @@ 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/4.3.0/src/commands/lightning/dev/app.ts)_
+_See code: [src/commands/lightning/dev/app.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/4.1.0/src/commands/lightning/dev/app.ts)_
 
 ## `sf lightning dev component`
 
 [Beta] Preview LWC components in isolation.
 
 ```
 USAGE
-  $ sf lightning dev component -o <value> [--json] [--flags-dir <value>] [-n <value>] [-c]
+  $ sf lightning dev component [--json] [--flags-dir <value>] [-n <value>] [-c] [-o <value>]
 
 FLAGS
   -c, --client-select       Launch component preview without selecting a component
   -n, --name=<value>        Name of a component to preview.
-  -o, --target-org=<value>  (required) Username or alias of the target org. Not required if the `target-org`
-                            configuration variable is already set.
+  -o, --target-org=<value>  Username or alias of the target org.
 
 GLOBAL FLAGS
   --flags-dir=<value>  Import flag values from a directory.
@@ -248,15 +247,15 @@ EXAMPLES
     $ sf lightning dev component --name myComponent
 ```
 
-_See code: [src/commands/lightning/dev/component.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/4.3.0/src/commands/lightning/dev/component.ts)_
+_See code: [src/commands/lightning/dev/component.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/4.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]
 
 FLAGS
   -l, --get-latest          Download the latest version of the specified site from your org, instead of using any local
@@ -266,7 +265,6 @@ FLAGS
   -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
 
 GLOBAL FLAGS
   --flags-dir=<value>  Import flag values from a directory.
@@ -304,7 +302,7 @@ 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/4.3.0/src/commands/lightning/dev/site.ts)_
+_See code: [src/commands/lightning/dev/site.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/4.1.0/src/commands/lightning/dev/site.ts)_
 
 ## Integration Testing
 

command-snapshot.json

@@ -20,7 +20,7 @@
     "command": "lightning:dev:site",
     "flagAliases": [],
     "flagChars": ["l", "n", "o"],
-    "flags": ["flags-dir", "get-latest", "guest", "name", "target-org", "ssr"],
+    "flags": ["flags-dir", "get-latest", "guest", "name", "target-org"],
     "plugin": "@salesforce/plugin-lightning-dev"
   }
 ]

messages/lightning.dev.app.md

@@ -31,6 +31,22 @@ Type of device to display the app preview.
 
 ID of the mobile device to display the preview if device type is set to `ios` or `android`. The default value is the ID of the first available mobile device.
 
+# error.username
+
+Org must have a valid user
+
+# error.identitydata
+
+Couldn't find identity data while generating preview arguments
+
+# error.identitydata.entityid
+
+Couldn't find entity ID while generating preview arguments
+
+# error.no-project
+
+This command is required to run from within a Salesforce project directory. %s
+
 # error.fetching.app-id
 
 Unable to determine App Id for %s

messages/lightning.dev.site.md

@@ -29,10 +29,6 @@ Download the latest version of the specified site from your org, instead of usin
 
 Preview the site as a guest user (rather than an authenticated user).
 
-# flags.ssr.summary
-
-Preview the SSR bundle
-
 # examples
 
 - Select a site to preview from the org "myOrg":

messages/shared.utils.md

@@ -37,19 +37,3 @@ Your org is on API version %s, but this version of the CLI plugin supports API v
 # error.org.api-mismatch.remediation
 
 To use the plugin with this org, you can reinstall or update the plugin using the "%s" tag. For example: "sf plugins install %s".
-
-# error.username
-
-Org must have a valid user
-
-# error.identitydata
-
-Couldn't find identity data while generating preview arguments
-
-# error.identitydata.entityid
-
-Couldn't find entity ID while generating preview arguments
-
-# error.no-project
-
-This command is required to run from within a Salesforce project directory. %s

package.json

@@ -1,31 +1,30 @@
 {
   "name": "@salesforce/plugin-lightning-dev",
   "description": "Lightning development tools for LEX, Mobile, and Experience Sites",
-  "version": "4.3.0",
+  "version": "4.1.0",
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
     "@inquirer/prompts": "^5.3.8",
     "@inquirer/select": "^2.4.7",
-    "@lwc/lwc-dev-server": "~13.0.29",
-    "@lwc/sfdc-lwc-compiler": "~13.0.29",
+    "@lwc/lwc-dev-server": "~12.3.4",
+    "@lwc/sfdc-lwc-compiler": "~12.3.4",
     "@lwrjs/api": "0.18.3",
-    "@oclif/core": "^4.4.1",
-    "@salesforce/core": "^8.15.0",
+    "@oclif/core": "^4.4.0",
+    "@salesforce/core": "^8.12.0",
     "@salesforce/kit": "^3.1.6",
     "@salesforce/lwc-dev-mobile-core": "4.0.0-alpha.10",
     "@salesforce/sf-plugins-core": "^11.2.4",
-    "axios": "^1.10.0",
+    "axios": "^1.8.2",
     "glob": "^10.4.5",
     "lightning-base-components": "1.27.2-alpha",
-    "lwc": "~8.20.1",
+    "lwc": "~8.20.0",
     "node-fetch": "^3.3.2",
-    "open": "^10.1.0",
     "xml2js": "^0.6.2"
   },
   "devDependencies": {
+    "@oclif/plugin-command-snapshot": "^5.3.2",
     "@salesforce/cli": "^2.93.7",
-    "@oclif/plugin-command-snapshot": "^5.3.3",
     "@salesforce/cli-plugins-testkit": "^5.3.39",
     "@salesforce/dev-scripts": "^11.0.2",
     "@salesforce/plugin-command-reference": "^3.1.58",
@@ -39,8 +38,8 @@
     "eslint-plugin-jsdoc": "^46.10.1",
     "eslint-plugin-sf-plugin": "^1.20.26",
     "eslint-plugin-unicorn": "^50.0.1",
-    "esmock": "^2.7.1",
-    "oclif": "^4.20.1",
+    "esmock": "^2.7.0",
+    "oclif": "^4.20.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.5.4"
   },
@@ -237,7 +236,7 @@
     ],
     "target": {
       "versionNumber": "65.0",
-      "matchingDevServerVersion": "~13.0.27"
+      "matchingDevServerVersion": "~12.3.4"
     },
     "versionToTagMappings": [
       {

src/commands/lightning/dev/app.ts

@@ -17,6 +17,7 @@ import {
   Platform,
 } from '@salesforce/lwc-dev-mobile-core';
 import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
+import { OrgUtils } from '../../../shared/orgUtils.js';
 import { startLWCServer } from '../../../lwc-dev-server/index.js';
 import { PreviewUtils } from '../../../shared/previewUtils.js';
 import { PromptUtils } from '../../../shared/promptUtils.js';
@@ -73,14 +74,32 @@ export default class LightningDevApp extends SfCommand<void> {
     try {
       sfdxProjectRootPath = await SfProject.resolveProjectPath();
     } catch (error) {
-      throw new Error(sharedMessages.getMessage('error.no-project', [(error as Error)?.message ?? '']));
+      return Promise.reject(new Error(messages.getMessage('error.no-project', [(error as Error)?.message ?? ''])));
     }
 
-    logger.debug('Initalizing preview connection and configuring local web server identity');
-    const { connection, ldpServerId, ldpServerToken } = await PreviewUtils.initializePreviewConnection(targetOrg);
+    const connection = targetOrg.getConnection(undefined);
+    const username = connection.getUsername();
+    if (!username) {
+      return Promise.reject(new Error(messages.getMessage('error.username')));
+    }
+
+    const localDevEnabled = await OrgUtils.isLocalDevEnabled(connection);
+    if (!localDevEnabled) {
+      return Promise.reject(new Error(sharedMessages.getMessage('error.localdev.not.enabled')));
+    }
+
+    OrgUtils.ensureMatchingAPIVersion(connection);
 
     const platform = flags['device-type'] ?? (await PromptUtils.promptUserToSelectPlatform());
 
+    logger.debug('Configuring local web server identity');
+    const appServerIdentity = await PreviewUtils.getOrCreateAppServerIdentity(connection);
+    const ldpServerToken = appServerIdentity.identityToken;
+    const ldpServerId = appServerIdentity.usernameToServerEntityIdMap[username];
+    if (!ldpServerId) {
+      return Promise.reject(new Error(messages.getMessage('error.identitydata.entityid')));
+    }
+
     const appId = await PreviewUtils.getLightningExperienceAppId(connection, appName, logger);
 
     logger.debug('Determining the next available port for Local Dev Server');
@@ -130,7 +149,25 @@ export default class LightningDevApp extends SfCommand<void> {
       logger.debug('No Lightning Experience application name provided.... using the default app instead.');
     }
 
-    const targetOrg = PreviewUtils.getTargetOrgFromArguments(this.argv);
+    // There are various ways to pass in a target org (as an alias, as a username, etc).
+    // We could have LightningPreviewApp parse its --target-org flag which will be resolved
+    // to an Org object (see https://github.com/forcedotcom/sfdx-core/blob/main/src/org/org.ts)
+    // then write a bunch of code to look at this Org object to try to determine whether
+    // it was initialized using Alias, Username, etc. and get a string representation of the
+    // org to be forwarded to OrgOpenCommand.
+    //
+    // Or we could simply look at the raw arguments passed to the LightningPreviewApp command,
+    // find the raw value for --target-org flag and forward that raw value to OrgOpenCommand.
+    // The OrgOpenCommand will then parse the raw value automatically. If the value is
+    // valid then OrgOpenCommand will consume it and continue. And if the value is invalid then
+    // OrgOpenCommand simply throws an error which will get bubbled up to LightningPreviewApp.
+    //
+    // Here we've chosen the second approach
+    const idx = this.argv.findIndex((item) => item.toLowerCase() === '-o' || item.toLowerCase() === '--target-org');
+    let targetOrg: string | undefined;
+    if (idx >= 0 && idx < this.argv.length - 1) {
+      targetOrg = this.argv[idx + 1];
+    }
 
     if (ldpServerUrl.startsWith('wss')) {
       this.log(`\n${messages.getMessage('trust.local.dev.server')}`);