fix: use new package that has no peerDependencies

Author: abdulsattar

package.json

@@ -7,14 +7,10 @@
   "dependencies": {
     "@inquirer/prompts": "^5.3.8",
     "@inquirer/select": "^2.4.7",
-    "@lwc/lwc-dev-server": "~13.3.8",
-    "@lwc/lwc-dev-server-65.0": "npm:@lwc/lwc-dev-server@~13.2.x",
-    "@lwc/lwc-dev-server-66.0": "npm:@lwc/lwc-dev-server@~13.3.x",
-    "@lwc/lwc-dev-server-67.0": "npm:@lwc/lwc-dev-server@~13.3.x",
-    "@lwc/sfdc-lwc-compiler": "~13.3.8",
-    "@lwc/sfdc-lwc-compiler-65.0": "npm:@lwc/sfdc-lwc-compiler@~13.2.x",
-    "@lwc/sfdc-lwc-compiler-66.0": "npm:@lwc/sfdc-lwc-compiler@~13.3.x",
-    "@lwc/sfdc-lwc-compiler-67.0": "npm:@lwc/sfdc-lwc-compiler@~13.3.x",
+    "@lwc/sfdx-local-dev-dist": "13.3.11-alpha.0+3edb66b",
+    "@lwc/sfdx-local-dev-dist-65.0": "npm:@lwc/sfdx-local-dev-dist@13.3.11-alpha.0+3edb66b",
+    "@lwc/sfdx-local-dev-dist-66.0": "npm:@lwc/sfdx-local-dev-dist@13.3.11-alpha.0+3edb66b",
+    "@lwc/sfdx-local-dev-dist-67.0": "npm:@lwc/sfdx-local-dev-dist@13.3.11-alpha.0+3edb66b",
     "@lwrjs/api": "0.18.3",
     "@oclif/core": "^4.5.6",
     "@salesforce/core": "^8.24.0",
@@ -23,10 +19,6 @@
     "@salesforce/sf-plugins-core": "^11.2.4",
     "axios": "^1.13.2",
     "glob": "^13.0.0",
-    "lwc": "~8.27.0",
-    "lwc-65.0": "npm:lwc@~8.23.x",
-    "lwc-66.0": "npm:lwc@~8.24.x",
-    "lwc-67.0": "npm:lwc@~8.24.x",
     "node-fetch": "^3.3.2",
     "open": "^10.2.0",
     "xml2js": "^0.6.2"
@@ -243,23 +235,17 @@
   "apiVersionMetadata": {
     "65.0": {
       "dependencies": {
-        "@lwc/lwc-dev-server": "~13.2.x",
-        "@lwc/sfdc-lwc-compiler": "~13.2.x",
-        "lwc": "~8.23.x"
+        "@lwc/sfdx-local-dev-dist": "13.3.11-alpha.0+3edb66b"
       }
     },
     "66.0": {
       "dependencies": {
-        "@lwc/lwc-dev-server": "~13.3.x",
-        "@lwc/sfdc-lwc-compiler": "~13.3.x",
-        "lwc": "~8.24.x"
+        "@lwc/sfdx-local-dev-dist": "13.3.11-alpha.0+3edb66b"
       }
     },
     "67.0": {
       "dependencies": {
-        "@lwc/lwc-dev-server": "~13.3.x",
-        "@lwc/sfdc-lwc-compiler": "~13.3.x",
-        "lwc": "~8.24.x"
+        "@lwc/sfdx-local-dev-dist": "13.3.11-alpha.0+3edb66b"
       }
     }
   },

src/configMeta.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { Workspace } from '@lwc/lwc-dev-server';
+import { Workspace } from '@lwc/sfdx-local-dev-dist';
 import { ConfigPropertyMeta, ConfigValue, Messages } from '@salesforce/core';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);

src/lwc-dev-server/index.ts

@@ -15,11 +15,11 @@
  */
 
 import process from 'node:process';
-import type { LWCServer, ServerConfig, Workspace } from '@lwc/lwc-dev-server';
+import type { LWCServer, ServerConfig, Workspace } from '@lwc/sfdx-local-dev-dist';
 import { Connection, Lifecycle, Logger, SfProject } from '@salesforce/core';
 import { SSLCertificateData } from '@salesforce/lwc-dev-mobile-core';
 import { glob } from 'glob';
-import { loadLwcDevServer } from '../shared/dependencyLoader.js';
+import { loadLwcModule } from '../shared/dependencyLoader.js';
 import {
   ConfigUtils,
   LOCAL_DEV_SERVER_DEFAULT_HTTP_PORT,
@@ -50,25 +50,30 @@ async function createLWCServerConfig(
       httpsPort: LOCAL_DEV_SERVER_DEFAULT_HTTP_PORT + 1,
     };
 
+  const resolvedWorkspace: Workspace = (workspace ??
+    (await ConfigUtils.getLocalDevServerWorkspace()) ??
+    LOCAL_DEV_SERVER_DEFAULT_WORKSPACE) as Workspace;
+
   const serverConfig: ServerConfig = {
     rootDir,
     // use custom port if any is provided, or fetch from config file (if any), otherwise use the default port
     port: ports.httpPort,
     paths: namespacePaths,
     // use custom workspace if any is provided, or fetch from config file (if any), otherwise use the default workspace
-    workspace: workspace ?? (await ConfigUtils.getLocalDevServerWorkspace()) ?? LOCAL_DEV_SERVER_DEFAULT_WORKSPACE,
+    workspace: resolvedWorkspace,
     identityToken: token,
-    lifecycle: Lifecycle.getInstance(),
+    lifecycle: Lifecycle.getInstance() as unknown as ServerConfig['lifecycle'],
     clientType,
     namespace: typeof namespace === 'string' && namespace.trim().length > 0 ? namespace.trim() : undefined,
   };
 
   if (certData?.pemCertificate && certData.pemPrivateKey) {
-    serverConfig.https = {
+    const httpsConfig: ServerConfig['https'] = {
       cert: certData.pemCertificate,
       key: certData.pemPrivateKey,
       port: ports.httpsPort,
     };
+    serverConfig.https = httpsConfig;
   }
 
   return serverConfig;
@@ -87,18 +92,25 @@ export async function startLWCServer(
   const orgApiVersion = connection.version;
   logger.trace(`Starting LWC server for org API version: ${orgApiVersion}`);
 
-  const lwcDevServerModule = await loadLwcDevServer(orgApiVersion);
+  const lwcDevServerModule = await loadLwcModule(orgApiVersion);
 
-  const config = await createLWCServerConfig(rootDir, token, clientType, serverPorts, certData, workspace);
+  const config: ServerConfig = await createLWCServerConfig(
+    rootDir,
+    token,
+    clientType,
+    serverPorts,
+    certData,
+    workspace,
+  );
 
   logger.trace(`Starting LWC Dev Server with config: ${JSON.stringify(config)}`);
-  let lwcDevServer = (await lwcDevServerModule.startLwcDevServer(config, logger)) as LWCServer | null;
+  const lwcDevServerResult = await lwcDevServerModule.startLwcDevServer(config, logger);
+  const lwcDevServer = lwcDevServerResult as LWCServer;
 
   const cleanup = (): void => {
     if (lwcDevServer) {
       logger.trace('Stopping LWC Dev Server');
       lwcDevServer.stopServer();
-      lwcDevServer = null;
     }
   };
 
@@ -108,5 +120,5 @@ export async function startLWCServer(
     'SIGTERM', // when a user kills the process
   ].forEach((signal) => process.on(signal, cleanup));
 
-  return lwcDevServer as LWCServer;
+  return lwcDevServer;
 }

src/shared/configUtils.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { Workspace } from '@lwc/lwc-dev-server';
+import { Workspace } from '@lwc/sfdx-local-dev-dist';
 import { SSLCertificateData } from '@salesforce/lwc-dev-mobile-core';
 import { Config, ConfigAggregator } from '@salesforce/core';
 import configMeta, { ConfigVars, SerializedSSLCertificateData } from './../configMeta.js';

src/shared/dependencyLoader.ts

@@ -24,9 +24,10 @@ type PackageJson = {
 const packageJson = packageJsonImport as unknown as PackageJson;
 
 /**
- * Type for dynamically loaded LWC server module
+ * Type for dynamically loaded LWC module from @lwc/sfdx-local-dev-dist
  */
-export type LwcDevServerModule = {
+export type LwcModule = {
+  [key: string]: unknown;
   startLwcDevServer: (config: unknown, logger: Logger) => Promise<unknown>;
   LWCServer: unknown;
   Workspace: unknown;
@@ -58,50 +59,23 @@ function resolveApiVersion(orgApiVersion: string): string {
 }
 
 /**
- * Internal helper to dynamically load an aliased dependency
+ * Loads the LWC module for the specified org API version
+ * Uses dynamic import to load the aliased package at runtime
+ *
+ * @param orgApiVersion - The API version from the org (e.g., '65.0.1')
+ * @returns The loaded module from @lwc/sfdx-local-dev-dist
  */
-async function loadDependency<T>(orgApiVersion: string, packagePrefix: string, friendlyName: string): Promise<T> {
+export async function loadLwcModule(orgApiVersion: string): Promise<LwcModule> {
   const version = resolveApiVersion(orgApiVersion);
-  const packageName = `${packagePrefix}${version}`;
+  const packageName = `@lwc/sfdx-local-dev-dist-${version}`;
 
   try {
-    return (await import(packageName)) as T;
+    return (await import(packageName)) as LwcModule;
   } catch (error) {
     throw new Error(
-      `Failed to load ${friendlyName} for version '${version}'. ` +
+      `Failed to load LWC module for version '${version}'. ` +
         `Package '${packageName}' could not be imported. ` +
         `Error: ${error instanceof Error ? error.message : String(error)}`,
     );
   }
 }
-
-/**
- * Loads the LWC dev server module for the specified org API version
- * Uses dynamic import to load the aliased package at runtime
- *
- * @param orgApiVersion - The API version from the org (e.g., '65.0.1')
- * @returns The loaded module
- */
-export async function loadLwcDevServer(orgApiVersion: string): Promise<LwcDevServerModule> {
-  return loadDependency<LwcDevServerModule>(orgApiVersion, '@lwc/lwc-dev-server-', 'LWC dev server');
-}
-
-/**
- * Loads the LWC compiler module for the specified org API version
- *
- * @param orgApiVersion - The API version from the org (e.g., '65.0.1')
- * @returns The loaded compiler module
- */
-export async function loadLwcCompiler(orgApiVersion: string): Promise<unknown> {
-  return loadDependency<unknown>(orgApiVersion, '@lwc/sfdc-lwc-compiler-', 'LWC compiler');
-}
-
-/**
- * Loads the base LWC module for the specified org API version
- *
- * @param orgApiVersion - The API version from the org (e.g., '65.0.1')
- * @returns The loaded LWC module
- */
-export async function loadLwc(orgApiVersion: string): Promise<unknown> {
-  return loadDependency<unknown>(orgApiVersion, 'lwc-', 'LWC');
-}

src/types/aliased-deps.d.ts

@@ -14,38 +14,16 @@
  * limitations under the License.
  */
 
-declare module '@lwc/lwc-dev-server-65.0' {
-  export * from '@lwc/lwc-dev-server';
+// Type declarations for @lwc/sfdx-local-dev-dist aliases
+// The main package @lwc/sfdx-local-dev-dist provides its own type definitions
+declare module '@lwc/sfdx-local-dev-dist-65.0' {
+  export * from '@lwc/sfdx-local-dev-dist';
 }
 
-declare module '@lwc/lwc-dev-server-66.0' {
-  export * from '@lwc/lwc-dev-server';
+declare module '@lwc/sfdx-local-dev-dist-66.0' {
+  export * from '@lwc/sfdx-local-dev-dist';
 }
 
-declare module '@lwc/lwc-dev-server-67.0' {
-  export * from '@lwc/lwc-dev-server';
-}
-
-declare module '@lwc/sfdc-lwc-compiler-65.0' {
-  export * from '@lwc/sfdc-lwc-compiler';
-}
-
-declare module '@lwc/sfdc-lwc-compiler-66.0' {
-  export * from '@lwc/sfdc-lwc-compiler';
-}
-
-declare module '@lwc/sfdc-lwc-compiler-67.0' {
-  export * from '@lwc/sfdc-lwc-compiler';
-}
-
-declare module 'lwc-65.0' {
-  export * from 'lwc';
-}
-
-declare module 'lwc-66.0' {
-  export * from 'lwc';
-}
-
-declare module 'lwc-67.0' {
-  export * from 'lwc';
+declare module '@lwc/sfdx-local-dev-dist-67.0' {
+  export * from '@lwc/sfdx-local-dev-dist';
 }

test/lwc-dev-server/index.test.ts

@@ -15,7 +15,8 @@
  */
 
 import { expect } from 'chai';
-import { LWCServer, Workspace } from '@lwc/lwc-dev-server';
+import type { LWCServer } from '@lwc/sfdx-local-dev-dist';
+import { Workspace } from '@lwc/sfdx-local-dev-dist';
 import esmock from 'esmock';
 import { TestContext } from '@salesforce/core/testSetup';
 import * as devServer from '../../src/lwc-dev-server/index.js';
@@ -30,7 +31,7 @@ describe('lwc-dev-server', () => {
 
   before(async () => {
     lwcDevServer = await esmock<typeof devServer>('../../src/lwc-dev-server/index.js', {
-      '@lwc/lwc-dev-server': {
+      '@lwc/sfdx-local-dev-dist': {
         startLwcDevServer: async () => server,
       },
     });

test/shared/configUtils.test.ts

@@ -15,7 +15,7 @@
  */
 
 import { expect } from 'chai';
-import { Workspace } from '@lwc/lwc-dev-server';
+import { Workspace } from '@lwc/sfdx-local-dev-dist';
 import { Config, ConfigAggregator } from '@salesforce/core';
 import { TestContext } from '@salesforce/core/testSetup';
 import { ConfigUtils, LocalWebServerIdentityData } from '../../src/shared/configUtils.js';
@@ -58,7 +58,7 @@ describe('configUtils', () => {
     $$.SANDBOX.stub(Config, 'addAllowedProperties').withArgs($$.SANDBOX.match.any);
     $$.SANDBOX.stub(Config.prototype, 'set').withArgs(
       ConfigVars.LOCAL_WEB_SERVER_IDENTITY_DATA,
-      $$.SANDBOX.match.string
+      $$.SANDBOX.match.string,
     );
     $$.SANDBOX.stub(Config.prototype, 'write').resolves();
     const identityData: LocalWebServerIdentityData = {

test/shared/dependencyLoader.test.ts

@@ -15,28 +15,26 @@
  */
 
 import { expect } from 'chai';
-import { loadLwcDevServer, loadLwcCompiler, loadLwc } from '../../src/shared/dependencyLoader.js';
+import { loadLwcModule } from '../../src/shared/dependencyLoader.js';
 
 describe('DependencyLoader', () => {
-  it('exists and has expected methods', () => {
-    expect(typeof loadLwcDevServer).to.equal('function');
-    expect(typeof loadLwcCompiler).to.equal('function');
-    expect(typeof loadLwc).to.equal('function');
+  it('exists and has expected method', () => {
+    expect(typeof loadLwcModule).to.equal('function');
   });
 
   it('loads the aliased package (real import call)', async () => {
     // This will actually try to call import() which should work since we ran yarn install.
     // However, loading LWC modules in Node might still trigger ReferenceErrors if browser globals are missing.
     // We use a try-catch to handle both cases and just verify the attempt was made.
     try {
-      const module = await loadLwcDevServer('65.0');
+      const module = await loadLwcModule('65.0');
       expect(module).to.exist;
     } catch (error) {
       // If it fails with a ReferenceError or similar, it's still "working" in terms of
       // attempting to load the right package name.
       const errorMessage = (error as Error).message;
       if (errorMessage.includes('could not be imported')) {
-        expect(errorMessage).to.include('@lwc/lwc-dev-server-65.0');
+        expect(errorMessage).to.include('@lwc/sfdx-local-dev-dist-65.0');
       } else {
         // Other errors (like ReferenceError: Element is not defined) mean the package WAS found and loaded
         expect(errorMessage).to.not.include('could not be imported');