@salesforce/plugin-lightning-dev 2.2.0 → 2.2.1

package/README.md

@@ -200,7 +200,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/2.2.0/src/commands/lightning/dev/app.ts)_
+_See code: [src/commands/lightning/dev/app.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/2.2.1/src/commands/lightning/dev/app.ts)_
 
 ## `sf lightning dev site`
 
@@ -244,6 +244,6 @@ EXAMPLES
     $ sf lightning dev site --name "Partner Central" --target-org myOrg
 ```
 
-_See code: [src/commands/lightning/dev/site.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/2.2.0/src/commands/lightning/dev/site.ts)_
+_See code: [src/commands/lightning/dev/site.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/2.2.1/src/commands/lightning/dev/site.ts)_
 
 <!-- commandsstop -->

package/lib/lwc-dev-server/index.js

@@ -4,60 +4,18 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { existsSync, lstatSync, readFileSync } from 'node:fs';
-import path from 'node:path';
 import process from 'node:process';
-import { LogLevel, startLwcDevServer } from '@lwc/lwc-dev-server';
-import { Lifecycle } from '@salesforce/core';
+import { startLwcDevServer } from '@lwc/lwc-dev-server';
+import { Lifecycle, SfProject } from '@salesforce/core';
+import { glob } from 'glob';
 import { ConfigUtils, LOCAL_DEV_SERVER_DEFAULT_HTTP_PORT, LOCAL_DEV_SERVER_DEFAULT_WORKSPACE, } from '../shared/configUtils.js';
-/**
- * Map sf cli log level to lwc dev server log level
- * https://github.com/salesforcecli/cli/wiki/Code-Your-Plugin#logging-levels
- *
- * @param cliLogLevel
- * @returns number
- */
-function mapLogLevel(cliLogLevel) {
-    switch (cliLogLevel) {
-        case 10:
-            return LogLevel.verbose;
-        case 20:
-            return LogLevel.debug;
-        case 30:
-            return LogLevel.info;
-        case 40:
-            return LogLevel.warn;
-        case 50:
-            return LogLevel.error;
-        case 60:
-            return LogLevel.silent;
-        default:
-            return LogLevel.error;
-    }
-}
-async function createLWCServerConfig(logger, rootDir, token, clientType, serverPorts, certData, workspace) {
-    const sfdxConfig = path.resolve(rootDir, 'sfdx-project.json');
-    if (!existsSync(sfdxConfig) || !lstatSync(sfdxConfig).isFile()) {
-        throw new Error(`sfdx-project.json not found in ${rootDir}`);
-    }
-    const sfdxConfigJson = readFileSync(sfdxConfig, 'utf-8');
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const { packageDirectories } = JSON.parse(sfdxConfigJson);
-    const namespacePaths = [];
-    for (const dir of packageDirectories) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        if (dir.path) {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument
-            const resolvedDir = path.resolve(rootDir, dir.path, 'main', 'default');
-            if (existsSync(resolvedDir) && lstatSync(resolvedDir).isDirectory()) {
-                logger.debug(`Adding ${resolvedDir} to namespace paths`);
-                namespacePaths.push(resolvedDir);
-            }
-            else {
-                logger.warn(`Skipping ${resolvedDir} because it does not exist or is not a directory`);
-            }
-        }
-    }
+async function createLWCServerConfig(rootDir, token, clientType, serverPorts, certData, workspace) {
+    const project = await SfProject.resolve();
+    const packageDirs = project.getPackageDirectories();
+    const projectJson = await project.resolveProjectConfig();
+    const { namespace } = projectJson;
+    // e.g. lwc folders in force-app/main/default/lwc, package-dir/lwc
+    const namespacePaths = (await Promise.all(packageDirs.map((dir) => glob(`${dir.fullPath}/**/lwc`)))).flat();
     const ports = serverPorts ??
         (await ConfigUtils.getLocalDevServerPorts()) ?? {
         httpPort: LOCAL_DEV_SERVER_DEFAULT_HTTP_PORT,
@@ -71,9 +29,9 @@ async function createLWCServerConfig(logger, rootDir, token, clientType, serverP
         // 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,
         identityToken: token,
-        logLevel: mapLogLevel(logger.getLevel()),
         lifecycle: Lifecycle.getInstance(),
         clientType,
+        namespace: typeof namespace === 'string' && namespace.trim().length > 0 ? namespace.trim() : undefined,
     };
     if (certData?.pemCertificate && certData.pemPrivateKey) {
         serverConfig.https = {
@@ -85,9 +43,9 @@ async function createLWCServerConfig(logger, rootDir, token, clientType, serverP
     return serverConfig;
 }
 export async function startLWCServer(logger, rootDir, token, clientType, serverPorts, certData, workspace) {
-    const config = await createLWCServerConfig(logger, rootDir, token, clientType, serverPorts, certData, workspace);
+    const config = await createLWCServerConfig(rootDir, token, clientType, serverPorts, certData, workspace);
     logger.trace(`Starting LWC Dev Server with config: ${JSON.stringify(config)}`);
-    let lwcDevServer = await startLwcDevServer(config);
+    let lwcDevServer = await startLwcDevServer(config, logger);
     const cleanup = () => {
         if (lwcDevServer) {
             logger.trace('Stopping LWC Dev Server');

package/lib/lwc-dev-server/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lwc-dev-server/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lwc-dev-server/index.ts"],"names":[],"mappings":"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"}