fix: cleanup

Author: abdulsattar

messages/shared.utils.md

@@ -54,10 +54,6 @@ Couldn't find identity data while generating preview arguments
 
 Couldn't find entity ID while generating preview arguments
 
-# error.org.api-unsupported
-
-Your org is on API Version %s. This version of the plugin supports only %s. Please update your plugin.
-
 # error.no-project
 
 This command is required to run from within a Salesforce project directory. %s

src/commands/lightning/dev/app.ts

@@ -173,8 +173,6 @@ export default class LightningDevApp extends SfCommand<void> {
       ldpServerToken,
       Platform.desktop,
       serverPorts,
-      undefined,
-      undefined,
     );
 
     // Open the browser and navigate to the right page
@@ -291,7 +289,6 @@ export default class LightningDevApp extends SfCommand<void> {
         platform,
         serverPorts,
         certData,
-        undefined,
       );
 
       // Launch the native app for previewing (launchMobileApp will show its own spinner)

src/commands/lightning/dev/component.ts

@@ -159,16 +159,7 @@ export default class LightningDevComponent extends SfCommand<ComponentPreviewRes
 
     const conn = targetOrg.getConnection(apiVersion);
 
-    await startLWCServer(
-      logger,
-      conn,
-      sfdxProjectRootPath,
-      ldpServerToken,
-      Platform.desktop,
-      serverPorts,
-      undefined,
-      undefined,
-    );
+    await startLWCServer(logger, conn, sfdxProjectRootPath, ldpServerToken, Platform.desktop, serverPorts);
 
     const targetOrgArg = PreviewUtils.getTargetOrgFromArguments(this.argv);
     const launchArguments = PreviewUtils.generateComponentPreviewLaunchArguments(

src/commands/lightning/dev/site.ts

@@ -181,16 +181,7 @@ export default class LightningDevSite extends SfCommand<void> {
     this.log(`Local Dev Server url is ${ldpServerUrl}`);
 
     const logger = await Logger.child(this.ctor.name);
-    await startLWCServer(
-      logger,
-      connection,
-      sfdxProjectRootPath,
-      ldpServerToken,
-      Platform.desktop,
-      serverPorts,
-      undefined,
-      undefined,
-    );
+    await startLWCServer(logger, connection, sfdxProjectRootPath, ldpServerToken, Platform.desktop, serverPorts);
     const url = new URL(previewUrl);
     url.searchParams.set('aura.ldpServerUrl', ldpServerUrl);
     url.searchParams.set('aura.ldpServerId', ldpServerId);

src/shared/orgUtils.ts

@@ -14,15 +14,7 @@
  * limitations under the License.
  */
 
-import { Connection, Messages } from '@salesforce/core';
-import packageJsonImport from '../../package.json' with { type: 'json' };
-
-Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
-const messages = Messages.loadMessages('@salesforce/plugin-lightning-dev', 'shared.utils');
-
-type PackageJsonWithApiVersionMetadata = {
-  apiVersionMetadata?: Record<string, unknown>;
-};
+import { Connection } from '@salesforce/core';
 
 type LightningPreviewMetadataResponse = {
   enableLightningPreviewPref?: string;
@@ -133,27 +125,4 @@ export class OrgUtils {
     }
     throw new Error('Could not save the app server identity token to the org.');
   }
-
-  /**
-   * Ensures the org's API version is supported by this plugin (per apiVersionMetadata in package.json).
-   *
-   * @param connection the connection to the org
-   */
-  public static ensureMatchingAPIVersion(connection: Connection): void {
-    if (process.env.SKIP_API_VERSION_CHECK === 'true') {
-      return;
-    }
-    const pkg = packageJsonImport as unknown as PackageJsonWithApiVersionMetadata;
-    const metadata = pkg.apiVersionMetadata;
-    if (!metadata) {
-      return;
-    }
-    const supportedVersions = Object.keys(metadata).sort();
-    const orgVersion = String(connection.version ?? '');
-    if (!orgVersion || supportedVersions.includes(orgVersion)) {
-      return;
-    }
-    const supportedList = supportedVersions.join(', ');
-    throw new Error(messages.getMessage('error.org.api-unsupported', [orgVersion, supportedList]));
-  }
 }

src/shared/previewUtils.ts

@@ -431,9 +431,6 @@ export class PreviewUtils {
       return Promise.reject(new Error(sharedMessages.getMessage('error.username')));
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call -- OrgUtils.ensureMatchingAPIVersion is typed in orgUtils
-    OrgUtils.ensureMatchingAPIVersion(connection);
-
     const appServerIdentity = await PreviewUtils.getOrCreateAppServerIdentity(connection);
     const ldpServerToken = appServerIdentity.identityToken;
     const ldpServerId = appServerIdentity.usernameToServerEntityIdMap[username];

test/commands/lightning/dev/app.test.ts

@@ -139,7 +139,6 @@ describe('lightning dev app', () => {
     $$.SANDBOX.stub(Connection.prototype, 'getUsername').returns(testUsername);
     $$.SANDBOX.stub(PreviewUtils, 'getOrCreateAppServerIdentity').resolves(testIdentityData);
     $$.SANDBOX.stub(OrgUtils, 'isLocalDevEnabled').resolves(true);
-    $$.SANDBOX.stub(OrgUtils, 'ensureMatchingAPIVersion').returns();
     $$.SANDBOX.stub(MetaUtils, 'handleLocalDevEnablement').resolves(undefined);
     // Stub prompt function as safety net to prevent hanging if handleLocalDevEnablement stub is removed
     $$.SANDBOX.stub(PromptUtils, 'promptUserToEnableLocalDev').resolves(true);

test/commands/lightning/dev/site.test.ts

@@ -21,7 +21,6 @@ import { expect } from 'chai';
 import esmock from 'esmock';
 import sinon from 'sinon';
 import LightningDevSite from '../../../../src/commands/lightning/dev/site.js';
-import { OrgUtils } from '../../../../src/shared/orgUtils.js';
 import { ExperienceSite } from '../../../../src/shared/experience/expSite.js';
 import { MetaUtils } from '../../../../src/shared/metaUtils.js';
 import { PreviewUtils } from '../../../../src/shared/previewUtils.js';
@@ -83,7 +82,6 @@ describe('lightning dev site', () => {
     $$.SANDBOX.stub(SfConfig.prototype, 'set');
     $$.SANDBOX.stub(SfConfig.prototype, 'write').resolves();
     $$.SANDBOX.stub(Connection.prototype, 'getUsername').returns(testUsername);
-    $$.SANDBOX.stub(OrgUtils, 'ensureMatchingAPIVersion').returns();
     $$.SANDBOX.stub(ExperienceSite, 'getAllExpSites').resolves(['TestSite']);
     $$.SANDBOX.stub(ExperienceSite.prototype, 'getPreviewUrl').resolves('https://test.salesforce.com/sites/TestSite');
     $$.SANDBOX.stub(ExperienceSite.prototype, 'isSiteSetup').resolves(true);

test/shared/previewUtils.test.ts

@@ -371,7 +371,6 @@ describe('previewUtils', () => {
       getUsername: () => testUsername,
     } as unknown as Connection;
 
-    $$.SANDBOX.stub(OrgUtils, 'ensureMatchingAPIVersion').returns();
     $$.SANDBOX.stub(PreviewUtils, 'getOrCreateAppServerIdentity').rejects(
       new Error(sharedMessages.getMessage('error.localdev.not.enabled')),
     );