@equinor/echo-cli 2.1.0-beta-0 → 2.1.0-beta-2

package/lib/echo-dev-host/package.json

@@ -21,13 +21,13 @@
     "author": "",
     "license": "MIT",
     "dependencies": {
-        "@equinor/echo-base": "2.2.0",
-        "@equinor/echo-components": "2.2.0",
-        "@equinor/echo-core": "2.2.0",
-        "@equinor/echo-framework": "2.2.0",
+        "@equinor/echo-base": "2.2.1",
+        "@equinor/echo-components": "2.2.1",
+        "@equinor/echo-core": "2.2.1",
+        "@equinor/echo-framework": "2.2.1",
         "@equinor/echo-scripts": "0.1.5",
-        "@equinor/echo-search": "2.2.0",
-        "@equinor/echo-utils": "2.2.0",
+        "@equinor/echo-search": "2.2.1",
+        "@equinor/echo-utils": "2.2.1",
         "@equinor/eds-core-react": "0.49.0",
         "@equinor/eds-icons": "0.22.0",
         "@equinor/eds-tokens": "0.10.0",

package/lib/sync-dev-host-to-app.d.ts

@@ -0,0 +1,26 @@
+#!/usr/bin/env node
+import { Command } from '@oclif/core';
+/**
+ * Command to synchronize echo-dev-host library versions with the consumer application's package.json.
+ *
+ * This command is useful when switching between git branches that may have different versions of
+ * @equinor/echo-* dependencies. It rebuilds the echo-dev-host to use the exact versions specified
+ * in the consumer app's package.json.
+ *
+ * @remarks
+ * The command performs the following steps:
+ * 1. Locates the consumer app's package.json containing @equinor/echo-* dependencies
+ * 2. Displays current versions of echo libraries in both dev-host and the app
+ * 3. Rebuilds echo-dev-host using sync mode to match the app's exact dependency versions
+ *
+ * @example
+ * ```bash
+ * npx sync-dev-host-to-app
+ * ```
+ *
+ * @throws {Error} Exits with code 1 if no package.json with @equinor/echo-* dependencies is found
+ */
+export default class SyncDevHostToApp extends Command {
+    static readonly description = "Sync echo-dev-host to use exact echo library versions from your app (useful after switching git branches)";
+    run(): Promise<void>;
+}

package/lib/sync-dev-host-to-app.js

@@ -0,0 +1,62 @@
+#!/usr/bin/env node
+import { Command } from '@oclif/core';
+import chalk from 'chalk';
+import path from 'node:path';
+import { ECHO_HOST_BUILD_OUTPUT_FOLDER, ECHO_HOST_TEMP_BUILD_FOLDER } from './const/common.js';
+import { buildAndCopyDevHost } from './tools/buildScripts/buildAndCopyDevHost.js';
+import { findConsumerAppPackageJson } from './utils/findConsumerAppPackageJson.js';
+import { printEchoLibsVersions } from './utils/printEchoLibsVersions.js';
+/**
+ * Command to synchronize echo-dev-host library versions with the consumer application's package.json.
+ *
+ * This command is useful when switching between git branches that may have different versions of
+ * @equinor/echo-* dependencies. It rebuilds the echo-dev-host to use the exact versions specified
+ * in the consumer app's package.json.
+ *
+ * @remarks
+ * The command performs the following steps:
+ * 1. Locates the consumer app's package.json containing @equinor/echo-* dependencies
+ * 2. Displays current versions of echo libraries in both dev-host and the app
+ * 3. Rebuilds echo-dev-host using sync mode to match the app's exact dependency versions
+ *
+ * @example
+ * ```bash
+ * npx sync-dev-host-to-app
+ * ```
+ *
+ * @throws {Error} Exits with code 1 if no package.json with @equinor/echo-* dependencies is found
+ */
+export default class SyncDevHostToApp extends Command {
+    static description = 'Sync echo-dev-host to use exact echo library versions from your app (useful after switching git branches)';
+    async run() {
+        console.log(chalk.cyan.bold('\n🔄 Syncing echo-dev-host versions to match your app...\n'));
+        // 1. Find consumer app package.json
+        const consumerPkgPath = findConsumerAppPackageJson(process.cwd());
+        if (!consumerPkgPath) {
+            console.error(chalk.red('Could not find a package.json with @equinor/echo-* dependencies.\nMake sure you are in an Echo module project directory.'));
+            process.exit(1);
+        }
+        // 2. Show current versions
+        const devHostPkgPath = path.resolve(process.cwd(), 'node_modules', '@equinor', 'echo-cli', 'lib', 'echo-dev-host', 'package.json');
+        console.log(chalk.yellow('Current versions:\n'));
+        await printEchoLibsVersions({
+            devHostPkgPath,
+            appPkgPath: consumerPkgPath,
+            fetchLatest: false
+        });
+        console.log(chalk.cyan("\n📌 This will rebuild echo-dev-host to match your app's package.json versions exactly.\n"));
+        // 3. Rebuild dev host with sync mode (forces consumer app versions)
+        const cliNodeModules = path.resolve(process.cwd(), 'node_modules', '@equinor', 'echo-cli');
+        const finalOutput = path.join(cliNodeModules, ECHO_HOST_BUILD_OUTPUT_FOLDER);
+        await buildAndCopyDevHost({
+            cliNodeModules,
+            tmpDevHostFolder: path.resolve(process.cwd(), ECHO_HOST_TEMP_BUILD_FOLDER),
+            finalOutputDir: finalOutput,
+            mode: 'sync'
+        });
+        console.log(chalk.green.bold("\n✅ Sync complete! echo-dev-host now uses your app's echo lib versions.\n"));
+        console.log(chalk.gray('You can now run "npm start" to start your Echo app.\n'));
+    }
+}
+SyncDevHostToApp.run();
+//# sourceMappingURL=sync-dev-host-to-app.js.map

package/lib/sync-dev-host-to-app.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync-dev-host-to-app.js","sourceRoot":"","sources":["../src/sync-dev-host-to-app.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,6BAA6B,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAC/F,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAClF,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAEzE;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,OAAO;IACjD,MAAM,CAAU,WAAW,GACvB,2GAA2G,CAAC;IAEhH,KAAK,CAAC,GAAG;QACL,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC,CAAC;QAE3F,oCAAoC;QACpC,MAAM,eAAe,GAAG,0BAA0B,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,eAAe,EAAE,CAAC;YACnB,OAAO,CAAC,KAAK,CACT,KAAK,CAAC,GAAG,CACL,0HAA0H,CAC7H,CACJ,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;QAED,2BAA2B;QAC3B,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAC/B,OAAO,CAAC,GAAG,EAAE,EACb,cAAc,EACd,UAAU,EACV,UAAU,EACV,KAAK,EACL,eAAe,EACf,cAAc,CACjB,CAAC;QAEF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,CAAC;QACjD,MAAM,qBAAqB,CAAC;YACxB,cAAc;YACd,UAAU,EAAE,eAAe;YAC3B,WAAW,EAAE,KAAK;SACrB,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,CACP,KAAK,CAAC,IAAI,CAAC,2FAA2F,CAAC,CAC1G,CAAC;QAEF,oEAAoE;QACpE,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAC3F,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,6BAA6B,CAAC,CAAC;QAE7E,MAAM,mBAAmB,CAAC;YACtB,cAAc;YACd,gBAAgB,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,2BAA2B,CAAC;YAC1E,cAAc,EAAE,WAAW;YAC3B,IAAI,EAAE,MAAM;SACf,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,2EAA2E,CAAC,CAAC,CAAC;QAC3G,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC,CAAC;IACrF,CAAC;;AAGL,gBAAgB,CAAC,GAAG,EAAE,CAAC"}

package/lib/sync-echo-dev-versions.d.ts

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+import { Command } from '@oclif/core';
+export default class SyncEchoDevVersions extends Command {
+    static readonly description = "Sync echo-dev-host to use exact echo library versions from your app (useful after switching git branches)";
+    run(): Promise<void>;
+}

package/lib/sync-echo-dev-versions.js

@@ -0,0 +1,43 @@
+#!/usr/bin/env node
+import { Command } from '@oclif/core';
+import chalk from 'chalk';
+import path from 'node:path';
+import { ECHO_HOST_BUILD_OUTPUT_FOLDER, ECHO_HOST_TEMP_BUILD_FOLDER } from './const/common.js';
+import { buildAndCopyDevHost } from './tools/buildScripts/buildAndCopyDevHost.js';
+import { findConsumerAppPackageJson } from './utils/findConsumerAppPackageJson.js';
+import { printEchoLibsVersions } from './utils/printEchoLibsVersions.js';
+export default class SyncEchoDevVersions extends Command {
+    static description = 'Sync echo-dev-host to use exact echo library versions from your app (useful after switching git branches)';
+    async run() {
+        console.log(chalk.cyan.bold('\n🔄 Syncing echo-dev-host versions to match your app...\n'));
+        // 1. Find consumer app package.json
+        const consumerPkgPath = findConsumerAppPackageJson(process.cwd());
+        if (!consumerPkgPath) {
+            console.error(chalk.red('Could not find a package.json with @equinor/echo-* dependencies.\nMake sure you are in an Echo module project directory.'));
+            process.exit(1);
+        }
+        // 2. Show current versions
+        const devHostPkgPath = path.resolve(process.cwd(), 'node_modules', '@equinor', 'echo-cli', 'lib', 'echo-dev-host', 'package.json');
+        console.log(chalk.yellow('Current versions:\n'));
+        await printEchoLibsVersions({
+            devHostPkgPath,
+            appPkgPath: consumerPkgPath,
+            fetchLatest: false
+        });
+        console.log(chalk.cyan("\n📌 This will rebuild echo-dev-host to match your app's package.json versions exactly.\n"));
+        // 3. Rebuild dev host with sync mode (forces consumer app versions)
+        const cliNodeModules = path.resolve(process.cwd(), 'node_modules', '@equinor', 'echo-cli');
+        const finalOutput = path.join(cliNodeModules, ECHO_HOST_BUILD_OUTPUT_FOLDER);
+        await buildAndCopyDevHost({
+            cliNodeModules,
+            tmpDevHostFolder: path.resolve(process.cwd(), ECHO_HOST_TEMP_BUILD_FOLDER),
+            finalOutputDir: finalOutput,
+            isProdBuild: false,
+            syncMode: true // New flag to force exact version matching
+        });
+        console.log(chalk.green.bold("\n✅ Sync complete! echo-dev-host now uses your app's echo lib versions.\n"));
+        console.log(chalk.gray('You can now run "npm start" to start your Echo app.\n'));
+    }
+}
+SyncEchoDevVersions.run();
+//# sourceMappingURL=sync-echo-dev-versions.js.map

package/lib/sync-echo-dev-versions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync-echo-dev-versions.js","sourceRoot":"","sources":["../src/sync-echo-dev-versions.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,6BAA6B,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAC/F,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAClF,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAEzE,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,OAAO;IACpD,MAAM,CAAU,WAAW,GACvB,2GAA2G,CAAC;IAEhH,KAAK,CAAC,GAAG;QACL,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC,CAAC;QAE3F,oCAAoC;QACpC,MAAM,eAAe,GAAG,0BAA0B,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,eAAe,EAAE,CAAC;YACnB,OAAO,CAAC,KAAK,CACT,KAAK,CAAC,GAAG,CACL,0HAA0H,CAC7H,CACJ,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;QAED,2BAA2B;QAC3B,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAC/B,OAAO,CAAC,GAAG,EAAE,EACb,cAAc,EACd,UAAU,EACV,UAAU,EACV,KAAK,EACL,eAAe,EACf,cAAc,CACjB,CAAC;QAEF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,CAAC;QACjD,MAAM,qBAAqB,CAAC;YACxB,cAAc;YACd,UAAU,EAAE,eAAe;YAC3B,WAAW,EAAE,KAAK;SACrB,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,CACP,KAAK,CAAC,IAAI,CAAC,2FAA2F,CAAC,CAC1G,CAAC;QAEF,oEAAoE;QACpE,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAC3F,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,6BAA6B,CAAC,CAAC;QAE7E,MAAM,mBAAmB,CAAC;YACtB,cAAc;YACd,gBAAgB,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,2BAA2B,CAAC;YAC1E,cAAc,EAAE,WAAW;YAC3B,WAAW,EAAE,KAAK;YAClB,QAAQ,EAAE,IAAI,CAAC,2CAA2C;SAC7D,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,2EAA2E,CAAC,CAAC,CAAC;QAC3G,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC,CAAC;IACrF,CAAC;;AAGL,mBAAmB,CAAC,GAAG,EAAE,CAAC"}

package/lib/tools/buildScripts/buildAndCopyDevHost.d.ts

@@ -1,11 +1,20 @@
+/**
+ * Build mode for echo-dev-host
+ * - 'dev': Standard development build (default)
+ * - 'prod': Production build using max(consumer, devHost) versions
+ * - 'sync': Force dev host to match consumer app versions exactly
+ */
+export type BuildMode = 'dev' | 'prod' | 'sync';
 /**
  * Builds and copies the Echo Dev Host application for local development or production use.
  *
  * This function performs the following steps:
  * 1. Removes and recreates a temporary folder for the dev host.
  * 2. Copies the echo-dev-host source files to the temporary folder.
- * 3. Optionally overrides echo library dependencies in the dev host's package.json for production builds,
- *    ensuring the dev host uses the same or newer versions as the consumer application.
+ * 3. Optionally overrides echo library dependencies based on the build mode:
+ *    - 'prod': Uses max(consumer, devHost) versions
+ *    - 'sync': Forces exact consumer app versions
+ *    - 'dev': Uses original dev host versions
  * 4. Installs dependencies and builds the dev host application.
  * 5. Copies the build output to the specified final output directory.
  * 6. Cleans up the temporary folder after the build process.
@@ -14,16 +23,50 @@
  * @param params.cliNodeModules - Path to the node_modules directory containing echo-dev-host.
  * @param params.tmpDevHostFolder - Path to the temporary folder used for building the dev host.
  * @param params.finalOutputDir - Path to the directory where the build output should be copied.
- * @param params.isProdBuild - If true, performs a production build and synchronizes echo library versions with the consumer app.
- * @param params.installAndBuild - (Optional) If true, installs dependencies and builds the dev host (default: true).
- * @param params.skipFetchingLatestVersions - (Optional) If true, skips fetching the latest versions of echo libraries.
+ * @param params.mode - Build mode: 'dev' (default), 'prod', or 'sync'
  *
  * @remarks
  * - Exits the process if a suitable consumer app package.json cannot be found.
  */
-export declare function buildAndCopyDevHost({ cliNodeModules, tmpDevHostFolder, finalOutputDir, isProdBuild }: {
+export declare function buildAndCopyDevHost({ cliNodeModules, tmpDevHostFolder, finalOutputDir, mode }: {
     cliNodeModules: string;
     tmpDevHostFolder: string;
     finalOutputDir: string;
-    isProdBuild?: boolean;
+    mode?: BuildMode;
 }): Promise<void>;
+/**
+ * Determines the versions of Echo libraries to use for a production build of the dev host,
+ * based on the dependencies specified in the consumer application's package.json.
+ *
+ * This function compares the Echo library dependencies between the consumer app and the dev host.
+ * If the consumer app requires a newer version of an Echo library than the dev host, the dev host's
+ * package.json is updated to use the consumer app's version for that library.
+ *
+ * The function logs the source of each version decision and writes any necessary updates to the dev host's
+ * package.json file.
+ *
+ * @param appPkgPath - The file path to the consumer application's package.json.
+ * @param tmpDevHostFolder - The folder path containing the dev host's package.json.
+ * @returns A promise that resolves to a record mapping each Echo library name to the version that will be used for the build.
+ * @internal - Exported for testing purposes only
+ */
+export declare function determineEchoLibVersionsForProdBuild({ appPkgPath, tmpDevHostFolder }: {
+    appPkgPath: string;
+    tmpDevHostFolder: string;
+}): Promise<Record<string, string>>;
+/**
+ * Forces the dev host to use the exact echo library versions from the consumer app's package.json.
+ * This is useful for developers switching between git branches with different echo lib versions.
+ *
+ * Unlike production builds which use max(consumer, devHost), this function always uses the consumer's
+ * version regardless of whether it's higher or lower than the dev host's current version.
+ *
+ * @param appPkgPath - The file path to the consumer application's package.json.
+ * @param tmpDevHostFolder - The folder path containing the dev host's package.json.
+ * @returns A promise that resolves to a record mapping each Echo library name to the version from the consumer app.
+ * @internal - Exported for testing purposes only
+ */
+export declare function syncDevHostToConsumerVersions({ appPkgPath, tmpDevHostFolder }: {
+    appPkgPath: string;
+    tmpDevHostFolder: string;
+}): Promise<Record<string, string>>;

package/lib/tools/buildScripts/buildAndCopyDevHost.js

@@ -13,8 +13,10 @@ import { printEchoLibsVersions } from '../../utils/printEchoLibsVersions.js';
  * This function performs the following steps:
  * 1. Removes and recreates a temporary folder for the dev host.
  * 2. Copies the echo-dev-host source files to the temporary folder.
- * 3. Optionally overrides echo library dependencies in the dev host's package.json for production builds,
- *    ensuring the dev host uses the same or newer versions as the consumer application.
+ * 3. Optionally overrides echo library dependencies based on the build mode:
+ *    - 'prod': Uses max(consumer, devHost) versions
+ *    - 'sync': Forces exact consumer app versions
+ *    - 'dev': Uses original dev host versions
  * 4. Installs dependencies and builds the dev host application.
  * 5. Copies the build output to the specified final output directory.
  * 6. Cleans up the temporary folder after the build process.
@@ -23,14 +25,12 @@ import { printEchoLibsVersions } from '../../utils/printEchoLibsVersions.js';
  * @param params.cliNodeModules - Path to the node_modules directory containing echo-dev-host.
  * @param params.tmpDevHostFolder - Path to the temporary folder used for building the dev host.
  * @param params.finalOutputDir - Path to the directory where the build output should be copied.
- * @param params.isProdBuild - If true, performs a production build and synchronizes echo library versions with the consumer app.
- * @param params.installAndBuild - (Optional) If true, installs dependencies and builds the dev host (default: true).
- * @param params.skipFetchingLatestVersions - (Optional) If true, skips fetching the latest versions of echo libraries.
+ * @param params.mode - Build mode: 'dev' (default), 'prod', or 'sync'
  *
  * @remarks
  * - Exits the process if a suitable consumer app package.json cannot be found.
  */
-export async function buildAndCopyDevHost({ cliNodeModules, tmpDevHostFolder, finalOutputDir, isProdBuild = false }) {
+export async function buildAndCopyDevHost({ cliNodeModules, tmpDevHostFolder, finalOutputDir, mode = 'dev' }) {
     console.log(`${chalk.cyan.bold('echo-dev-host')} - by Echo Core Team`);
     console.log('Minimalistic host application for local development of Echo applications.\n');
     console.log(figlet.textSync('Echo Dev Host', {
@@ -41,7 +41,7 @@ export async function buildAndCopyDevHost({ cliNodeModules, tmpDevHostFolder, fi
     const devHostSrc = path.join(cliNodeModules, 'lib', 'echo-dev-host');
     const buildOutput = path.join(tmpDevHostFolder, ECHO_HOST_BUILD_OUTPUT_FOLDER);
     const srcPkgJson = path.join(devHostSrc, 'package.json');
-    if (isProdBuild) {
+    if (mode === 'prod') {
         console.log(chalk.blueBright.bold(`\n[echo-dev-host] Building the echo app for Production.\n`));
     }
     // Always remove and recreate the temporary folder
@@ -60,17 +60,23 @@ export async function buildAndCopyDevHost({ cliNodeModules, tmpDevHostFolder, fi
         console.log('Could not find a package.json with supported echo libs. Supported libs are:', SUPPORTED_ECHO_LIBS.join(', '));
         process.exit(1);
     }
-    if (isProdBuild) {
+    if (mode === 'prod') {
         echoLibVersionsToUse = await determineEchoLibVersionsForProdBuild({
             appPkgPath,
             tmpDevHostFolder
         });
     }
+    else if (mode === 'sync') {
+        echoLibVersionsToUse = await syncDevHostToConsumerVersions({
+            appPkgPath,
+            tmpDevHostFolder
+        });
+    }
     await printEchoLibsVersions({
-        devHostPkgPath: srcPkgJson,
+        devHostPkgPath: mode === 'dev' ? srcPkgJson : path.join(tmpDevHostFolder, 'package.json'),
         appPkgPath: appPkgPath,
-        fetchLatest: !isProdBuild,
-        echoLibVersionsToUse: isProdBuild ? echoLibVersionsToUse : undefined
+        fetchLatest: mode !== 'prod',
+        echoLibVersionsToUse: mode === 'prod' ? echoLibVersionsToUse : undefined
     });
     execSync('npm install', { cwd: tmpDevHostFolder, stdio: 'inherit' });
     execSync('npm run build', { cwd: tmpDevHostFolder, stdio: 'inherit' });
@@ -82,7 +88,7 @@ export async function buildAndCopyDevHost({ cliNodeModules, tmpDevHostFolder, fi
         fs.removeSync(tmpDevHostFolder);
     }
     console.log(chalk.green.bold('[echo-dev-host] Build and copy complete!\n'));
-    if (!isProdBuild) {
+    if (mode !== 'prod') {
         console.log(chalk.green.bold('[echo-dev-host] Now you can start your Echo app with "npm start"\n'));
     }
 }
@@ -100,8 +106,9 @@ export async function buildAndCopyDevHost({ cliNodeModules, tmpDevHostFolder, fi
  * @param appPkgPath - The file path to the consumer application's package.json.
  * @param tmpDevHostFolder - The folder path containing the dev host's package.json.
  * @returns A promise that resolves to a record mapping each Echo library name to the version that will be used for the build.
+ * @internal - Exported for testing purposes only
  */
-async function determineEchoLibVersionsForProdBuild({ appPkgPath, tmpDevHostFolder }) {
+export async function determineEchoLibVersionsForProdBuild({ appPkgPath, tmpDevHostFolder }) {
     const consumerPkg = fs.readJsonSync(appPkgPath);
     const consumerAppName = consumerPkg.name || 'the consumer app';
     console.log(chalk.magentaBright.bold(`\n[echo-dev-host] Prod build - Using latest echo lib versions from "${consumerAppName}" or echo dev host.\n`));
@@ -113,17 +120,28 @@ async function determineEchoLibVersionsForProdBuild({ appPkgPath, tmpDevHostFold
     for (const [lib, consumerVersion] of echoDeps) {
         const devHostVersion = devHostPkg.dependencies?.[lib];
         let source = consumerAppName;
-        let finalVersion = consumerVersion;
-        if (devHostVersion &&
-            semver.valid(devHostVersion) &&
-            semver.valid(consumerVersion) &&
-            semver.gt(devHostVersion, consumerVersion)) {
-            source = 'echo dev host';
-            devHostPkg.dependencies[lib] = devHostVersion;
+        let finalVersion = consumerVersion; // Default to consumer version
+        if (devHostVersion && semver.valid(devHostVersion) && semver.valid(consumerVersion)) {
+            // Use whichever version is higher
+            if (semver.gt(devHostVersion, consumerVersion)) {
+                // Dev host version is higher, keep it
+                source = 'echo dev host';
+                finalVersion = devHostVersion;
+            }
+            else if (semver.gt(consumerVersion, devHostVersion)) {
+                // Consumer version is higher, update dev host package.json
+                devHostPkg.dependencies[lib] = consumerVersion;
+                updated = true;
+            }
+            // If versions are equal, finalVersion stays as consumerVersion
+        }
+        else if (!devHostVersion) {
+            // Dev host doesn't have this library, add it from consumer
+            devHostPkg.dependencies[lib] = consumerVersion;
             updated = true;
         }
         // Track the version that will be used for the build
-        echoLibVersionsToUse[lib] = devHostPkg.dependencies?.[lib] || consumerVersion;
+        echoLibVersionsToUse[lib] = finalVersion;
         // Log the decision
         console.log(`${chalk.cyan(lib)}: ${chalk.yellow(finalVersion)} (from ${source})`);
     }
@@ -132,4 +150,49 @@ async function determineEchoLibVersionsForProdBuild({ appPkgPath, tmpDevHostFold
     }
     return echoLibVersionsToUse;
 }
+/**
+ * Forces the dev host to use the exact echo library versions from the consumer app's package.json.
+ * This is useful for developers switching between git branches with different echo lib versions.
+ *
+ * Unlike production builds which use max(consumer, devHost), this function always uses the consumer's
+ * version regardless of whether it's higher or lower than the dev host's current version.
+ *
+ * @param appPkgPath - The file path to the consumer application's package.json.
+ * @param tmpDevHostFolder - The folder path containing the dev host's package.json.
+ * @returns A promise that resolves to a record mapping each Echo library name to the version from the consumer app.
+ * @internal - Exported for testing purposes only
+ */
+export async function syncDevHostToConsumerVersions({ appPkgPath, tmpDevHostFolder }) {
+    const consumerPkg = fs.readJsonSync(appPkgPath);
+    const consumerAppName = consumerPkg.name || 'your app';
+    console.log(chalk.magentaBright.bold(`\n[echo-dev-host] Syncing to exact echo lib versions from "${consumerAppName}".\n`));
+    const devHostPkgPath = path.join(tmpDevHostFolder, 'package.json');
+    const devHostPkg = fs.readJsonSync(devHostPkgPath);
+    const echoDeps = getEchoDeps(consumerPkg);
+    let updated = false;
+    const echoLibVersionsToUse = {};
+    for (const [lib, consumerVersion] of echoDeps) {
+        const devHostVersion = devHostPkg.dependencies?.[lib];
+        // Always use consumer version (force sync)
+        echoLibVersionsToUse[lib] = consumerVersion;
+        if (devHostVersion === consumerVersion) {
+            console.log(`${chalk.cyan(lib)}: ${chalk.yellow(consumerVersion)} ${chalk.gray('(already synced)')}`);
+        }
+        else {
+            devHostPkg.dependencies[lib] = consumerVersion;
+            updated = true;
+            const previousVersion = devHostVersion || 'not installed';
+            const wasMessage = chalk.gray(`(was ${previousVersion})`);
+            console.log(`${chalk.cyan(lib)}: ${chalk.yellow(consumerVersion)} ${wasMessage}`);
+        }
+    }
+    if (updated) {
+        fs.writeJsonSync(devHostPkgPath, devHostPkg, { spaces: 4 });
+        console.log(chalk.green('\n✓ Updated dev host package.json'));
+    }
+    else {
+        console.log(chalk.gray('\n✓ All versions already synced'));
+    }
+    return echoLibVersionsToUse;
+}
 //# sourceMappingURL=buildAndCopyDevHost.js.map

package/lib/tools/buildScripts/buildAndCopyDevHost.js.map

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