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

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

@@ -0,0 +1,502 @@
+// Mock all dependencies BEFORE any imports
+jest.mock('fs-extra');
+jest.mock('../../utils/printEchoLibsVersions.js', () => ({
+    printEchoLibsVersions: jest.fn()
+}));
+jest.mock('chalk', () => {
+    const mockFn = jest.fn((str) => str);
+    const chalkMock = {
+        cyan: mockFn,
+        yellow: mockFn,
+        gray: mockFn,
+        green: mockFn,
+        magentaBright: { bold: mockFn },
+        blueBright: { bold: mockFn },
+        yellowBright: { bold: mockFn },
+        greenBright: { bold: mockFn }
+    };
+    // Also add nested bold methods for green
+    chalkMock.green.bold = mockFn;
+    // Return both default export and named export pattern
+    chalkMock.default = chalkMock;
+    return chalkMock;
+});
+jest.mock('figlet', () => ({
+    default: {
+        textSync: jest.fn(() => 'ECHO DEV HOST')
+    }
+}));
+jest.mock('child_process', () => ({
+    execSync: jest.fn()
+}));
+import fs from 'fs-extra';
+import path from 'node:path';
+import { determineEchoLibVersionsForProdBuild, syncDevHostToConsumerVersions } from './buildAndCopyDevHost';
+const mockedFs = fs;
+// Mock console.log to suppress output during tests
+const originalConsoleLog = console.log;
+beforeAll(() => {
+    console.log = jest.fn();
+});
+afterAll(() => {
+    console.log = originalConsoleLog;
+});
+describe('determineEchoLibVersionsForProdBuild', () => {
+    const tmpDevHostFolder = '/tmp/dev-host';
+    const devHostPkgPath = path.join(tmpDevHostFolder, 'package.json');
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+    describe('Consumer version is higher than dev host version', () => {
+        it('should update dev host package.json with consumer versions when consumer has higher versions', async () => {
+            // Arrange
+            const consumerPkg = {
+                name: 'test-consumer-app',
+                dependencies: {
+                    '@equinor/echo-base': '2.2.1',
+                    '@equinor/echo-core': '2.2.1',
+                    '@equinor/echo-framework': '2.2.1'
+                }
+            };
+            const devHostPkg = {
+                name: 'echo-dev-host',
+                dependencies: {
+                    '@equinor/echo-base': '2.0.1',
+                    '@equinor/echo-core': '2.0.1',
+                    '@equinor/echo-framework': '2.0.1'
+                }
+            };
+            mockedFs.readJsonSync.mockImplementation((filePath) => {
+                if (filePath.includes('consumer'))
+                    return consumerPkg;
+                if (filePath === devHostPkgPath)
+                    return devHostPkg;
+                throw new Error(`Unexpected file path: ${filePath}`);
+            });
+            // Act
+            const result = await determineEchoLibVersionsForProdBuild({
+                appPkgPath: '/path/to/consumer/package.json',
+                tmpDevHostFolder
+            });
+            // Assert
+            expect(result).toEqual({
+                '@equinor/echo-base': '2.2.1',
+                '@equinor/echo-core': '2.2.1',
+                '@equinor/echo-framework': '2.2.1'
+            });
+            // Verify dev host package.json was updated
+            expect(mockedFs.writeJsonSync).toHaveBeenCalledWith(devHostPkgPath, expect.objectContaining({
+                dependencies: {
+                    '@equinor/echo-base': '2.2.1',
+                    '@equinor/echo-core': '2.2.1',
+                    '@equinor/echo-framework': '2.2.1'
+                }
+            }), { spaces: 4 });
+        });
+    });
+    describe('Dev host version is higher than consumer version', () => {
+        it('should keep dev host versions when dev host has higher versions', async () => {
+            // Arrange
+            const consumerPkg = {
+                name: 'test-consumer-app',
+                dependencies: {
+                    '@equinor/echo-base': '2.0.1',
+                    '@equinor/echo-core': '2.0.1'
+                }
+            };
+            const devHostPkg = {
+                name: 'echo-dev-host',
+                dependencies: {
+                    '@equinor/echo-base': '2.2.1',
+                    '@equinor/echo-core': '2.2.1'
+                }
+            };
+            mockedFs.readJsonSync.mockImplementation((filePath) => {
+                if (filePath.includes('consumer'))
+                    return consumerPkg;
+                if (filePath === devHostPkgPath)
+                    return devHostPkg;
+                throw new Error(`Unexpected file path: ${filePath}`);
+            });
+            // Act
+            const result = await determineEchoLibVersionsForProdBuild({
+                appPkgPath: '/path/to/consumer/package.json',
+                tmpDevHostFolder
+            });
+            // Assert
+            expect(result).toEqual({
+                '@equinor/echo-base': '2.2.1',
+                '@equinor/echo-core': '2.2.1'
+            });
+            // Verify dev host package.json was NOT updated (no changes needed)
+            expect(mockedFs.writeJsonSync).not.toHaveBeenCalled();
+        });
+    });
+    describe('Mixed version scenarios', () => {
+        it('should use max version for each library independently', async () => {
+            // Arrange
+            const consumerPkg = {
+                name: 'test-consumer-app',
+                dependencies: {
+                    '@equinor/echo-base': '2.2.1', // Consumer higher
+                    '@equinor/echo-core': '2.0.1', // Dev host higher
+                    '@equinor/echo-framework': '2.1.0' // Equal
+                }
+            };
+            const devHostPkg = {
+                name: 'echo-dev-host',
+                dependencies: {
+                    '@equinor/echo-base': '2.0.1',
+                    '@equinor/echo-core': '2.2.1',
+                    '@equinor/echo-framework': '2.1.0'
+                }
+            };
+            mockedFs.readJsonSync.mockImplementation((filePath) => {
+                if (filePath.includes('consumer'))
+                    return consumerPkg;
+                if (filePath === devHostPkgPath)
+                    return devHostPkg;
+                throw new Error(`Unexpected file path: ${filePath}`);
+            });
+            // Act
+            const result = await determineEchoLibVersionsForProdBuild({
+                appPkgPath: '/path/to/consumer/package.json',
+                tmpDevHostFolder
+            });
+            // Assert
+            expect(result).toEqual({
+                '@equinor/echo-base': '2.2.1', // Consumer version used
+                '@equinor/echo-core': '2.2.1', // Dev host version used
+                '@equinor/echo-framework': '2.1.0' // Equal, consumer used
+            });
+            // Verify only echo-base was updated in dev host package.json
+            expect(mockedFs.writeJsonSync).toHaveBeenCalledWith(devHostPkgPath, expect.objectContaining({
+                dependencies: {
+                    '@equinor/echo-base': '2.2.1', // Updated
+                    '@equinor/echo-core': '2.2.1', // Unchanged
+                    '@equinor/echo-framework': '2.1.0' // Unchanged
+                }
+            }), { spaces: 4 });
+        });
+    });
+    describe('Missing dependencies in dev host', () => {
+        it('should add missing libraries from consumer to dev host', async () => {
+            // Arrange
+            const consumerPkg = {
+                name: 'test-consumer-app',
+                dependencies: {
+                    '@equinor/echo-base': '2.2.1',
+                    '@equinor/echo-core': '2.2.1',
+                    '@equinor/echo-utils': '2.0.2' // Missing in dev host
+                }
+            };
+            const devHostPkg = {
+                name: 'echo-dev-host',
+                dependencies: {
+                    '@equinor/echo-base': '2.0.1',
+                    '@equinor/echo-core': '2.0.1'
+                    // echo-utils is missing
+                }
+            };
+            mockedFs.readJsonSync.mockImplementation((filePath) => {
+                if (filePath.includes('consumer'))
+                    return consumerPkg;
+                if (filePath === devHostPkgPath)
+                    return devHostPkg;
+                throw new Error(`Unexpected file path: ${filePath}`);
+            });
+            // Act
+            const result = await determineEchoLibVersionsForProdBuild({
+                appPkgPath: '/path/to/consumer/package.json',
+                tmpDevHostFolder
+            });
+            // Assert
+            expect(result).toEqual({
+                '@equinor/echo-base': '2.2.1',
+                '@equinor/echo-core': '2.2.1',
+                '@equinor/echo-utils': '2.0.2'
+            });
+            // Verify dev host package.json was updated with all three libraries
+            expect(mockedFs.writeJsonSync).toHaveBeenCalledWith(devHostPkgPath, expect.objectContaining({
+                dependencies: {
+                    '@equinor/echo-base': '2.2.1',
+                    '@equinor/echo-core': '2.2.1',
+                    '@equinor/echo-utils': '2.0.2' // Added
+                }
+            }), { spaces: 4 });
+        });
+    });
+    describe('Real-world bug scenario from issue report', () => {
+        it('should reproduce and fix the reported bug where consumer 2.2.1 was ignored and dev host 2.0.1 was used', async () => {
+            // This is the exact scenario from the user's bug report
+            const consumerPkg = {
+                name: 'echo-3d-web',
+                dependencies: {
+                    '@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-search': '2.2.1',
+                    '@equinor/echo-utils': '2.2.1',
+                    '@equinor/echo-cli': '2.0.0'
+                }
+            };
+            const devHostPkg = {
+                name: 'echo-dev-host',
+                dependencies: {
+                    '@equinor/echo-base': '2.0.1',
+                    '@equinor/echo-components': '2.0.1',
+                    '@equinor/echo-core': '2.0.1',
+                    '@equinor/echo-framework': '2.0.1',
+                    '@equinor/echo-search': '2.0.1',
+                    '@equinor/echo-utils': '2.0.2'
+                }
+            };
+            mockedFs.readJsonSync.mockImplementation((filePath) => {
+                if (filePath.includes('consumer') || filePath.includes('echo-3d-web'))
+                    return consumerPkg;
+                if (filePath === devHostPkgPath)
+                    return devHostPkg;
+                throw new Error(`Unexpected file path: ${filePath}`);
+            });
+            // Act
+            const result = await determineEchoLibVersionsForProdBuild({
+                appPkgPath: '/path/to/echo-3d-web/package.json',
+                tmpDevHostFolder
+            });
+            // Assert - All should use the consumer's 2.2.1 versions (except echo-utils which is higher in dev host)
+            expect(result).toEqual({
+                '@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-search': '2.2.1',
+                '@equinor/echo-utils': '2.2.1', // Consumer version is higher than 2.0.2
+                '@equinor/echo-cli': '2.0.0'
+            });
+            // Verify dev host package.json was updated with the higher consumer versions
+            expect(mockedFs.writeJsonSync).toHaveBeenCalledWith(devHostPkgPath, expect.objectContaining({
+                dependencies: expect.objectContaining({
+                    '@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-search': '2.2.1',
+                    '@equinor/echo-utils': '2.2.1',
+                    '@equinor/echo-cli': '2.0.0'
+                })
+            }), { spaces: 4 });
+        });
+    });
+});
+describe('syncDevHostToConsumerVersions', () => {
+    const tmpDevHostFolder = '/tmp/dev-host';
+    const devHostPkgPath = path.join(tmpDevHostFolder, 'package.json');
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+    describe('Force sync behavior', () => {
+        it('should downgrade dev host versions to match lower consumer versions', async () => {
+            // Arrange
+            const consumerPkg = {
+                name: 'my-echo-app',
+                dependencies: {
+                    '@equinor/echo-core': '2.0.1',
+                    '@equinor/echo-framework': '2.0.1'
+                }
+            };
+            const devHostPkg = {
+                name: 'echo-dev-host',
+                dependencies: {
+                    '@equinor/echo-core': '2.3.0', // Higher than consumer
+                    '@equinor/echo-framework': '2.3.0' // Higher than consumer
+                }
+            };
+            mockedFs.readJsonSync.mockImplementation((filePath) => {
+                if (filePath.includes('my-echo-app'))
+                    return consumerPkg;
+                if (filePath === devHostPkgPath)
+                    return devHostPkg;
+                throw new Error(`Unexpected file path: ${filePath}`);
+            });
+            // Act
+            const result = await syncDevHostToConsumerVersions({
+                appPkgPath: '/path/to/my-echo-app/package.json',
+                tmpDevHostFolder
+            });
+            // Assert - Should force downgrade to consumer versions
+            expect(result).toEqual({
+                '@equinor/echo-core': '2.0.1',
+                '@equinor/echo-framework': '2.0.1'
+            });
+            // Verify dev host was downgraded
+            expect(mockedFs.writeJsonSync).toHaveBeenCalledWith(devHostPkgPath, expect.objectContaining({
+                dependencies: {
+                    '@equinor/echo-core': '2.0.1',
+                    '@equinor/echo-framework': '2.0.1'
+                }
+            }), { spaces: 4 });
+        });
+        it('should upgrade dev host versions to match higher consumer versions', async () => {
+            // Arrange
+            const consumerPkg = {
+                name: 'my-echo-app',
+                dependencies: {
+                    '@equinor/echo-core': '2.5.0',
+                    '@equinor/echo-framework': '2.5.0'
+                }
+            };
+            const devHostPkg = {
+                name: 'echo-dev-host',
+                dependencies: {
+                    '@equinor/echo-core': '2.0.1', // Lower than consumer
+                    '@equinor/echo-framework': '2.0.1' // Lower than consumer
+                }
+            };
+            mockedFs.readJsonSync.mockImplementation((filePath) => {
+                if (filePath.includes('my-echo-app'))
+                    return consumerPkg;
+                if (filePath === devHostPkgPath)
+                    return devHostPkg;
+                throw new Error(`Unexpected file path: ${filePath}`);
+            });
+            // Act
+            const result = await syncDevHostToConsumerVersions({
+                appPkgPath: '/path/to/my-echo-app/package.json',
+                tmpDevHostFolder
+            });
+            // Assert - Should upgrade to consumer versions
+            expect(result).toEqual({
+                '@equinor/echo-core': '2.5.0',
+                '@equinor/echo-framework': '2.5.0'
+            });
+            expect(mockedFs.writeJsonSync).toHaveBeenCalledWith(devHostPkgPath, expect.objectContaining({
+                dependencies: {
+                    '@equinor/echo-core': '2.5.0',
+                    '@equinor/echo-framework': '2.5.0'
+                }
+            }), { spaces: 4 });
+        });
+        it('should not update package.json if versions already match', async () => {
+            // Arrange
+            const consumerPkg = {
+                name: 'my-echo-app',
+                dependencies: {
+                    '@equinor/echo-core': '2.2.1',
+                    '@equinor/echo-framework': '2.2.1'
+                }
+            };
+            const devHostPkg = {
+                name: 'echo-dev-host',
+                dependencies: {
+                    '@equinor/echo-core': '2.2.1', // Same as consumer
+                    '@equinor/echo-framework': '2.2.1' // Same as consumer
+                }
+            };
+            mockedFs.readJsonSync.mockImplementation((filePath) => {
+                if (filePath.includes('my-echo-app'))
+                    return consumerPkg;
+                if (filePath === devHostPkgPath)
+                    return devHostPkg;
+                throw new Error(`Unexpected file path: ${filePath}`);
+            });
+            // Act
+            const result = await syncDevHostToConsumerVersions({
+                appPkgPath: '/path/to/my-echo-app/package.json',
+                tmpDevHostFolder
+            });
+            // Assert
+            expect(result).toEqual({
+                '@equinor/echo-core': '2.2.1',
+                '@equinor/echo-framework': '2.2.1'
+            });
+            // Should NOT write to package.json if already synced
+            expect(mockedFs.writeJsonSync).not.toHaveBeenCalled();
+        });
+        it('should handle mixed versions (some up, some down, some same)', async () => {
+            // Arrange
+            const consumerPkg = {
+                name: 'my-echo-app',
+                dependencies: {
+                    '@equinor/echo-core': '2.0.1', // Lower than dev host
+                    '@equinor/echo-framework': '2.5.0', // Higher than dev host
+                    '@equinor/echo-search': '2.2.1' // Same as dev host
+                }
+            };
+            const devHostPkg = {
+                name: 'echo-dev-host',
+                dependencies: {
+                    '@equinor/echo-core': '2.3.0',
+                    '@equinor/echo-framework': '2.0.1',
+                    '@equinor/echo-search': '2.2.1'
+                }
+            };
+            mockedFs.readJsonSync.mockImplementation((filePath) => {
+                if (filePath.includes('my-echo-app'))
+                    return consumerPkg;
+                if (filePath === devHostPkgPath)
+                    return devHostPkg;
+                throw new Error(`Unexpected file path: ${filePath}`);
+            });
+            // Act
+            const result = await syncDevHostToConsumerVersions({
+                appPkgPath: '/path/to/my-echo-app/package.json',
+                tmpDevHostFolder
+            });
+            // Assert - All should match consumer, regardless of direction
+            expect(result).toEqual({
+                '@equinor/echo-core': '2.0.1',
+                '@equinor/echo-framework': '2.5.0',
+                '@equinor/echo-search': '2.2.1'
+            });
+            // Only echo-core and echo-framework should be updated (echo-search already synced)
+            expect(mockedFs.writeJsonSync).toHaveBeenCalledWith(devHostPkgPath, expect.objectContaining({
+                dependencies: {
+                    '@equinor/echo-core': '2.0.1',
+                    '@equinor/echo-framework': '2.5.0',
+                    '@equinor/echo-search': '2.2.1'
+                }
+            }), { spaces: 4 });
+        });
+        it('should add missing libraries from consumer app', async () => {
+            // Arrange
+            const consumerPkg = {
+                name: 'my-echo-app',
+                dependencies: {
+                    '@equinor/echo-core': '2.2.1',
+                    '@equinor/echo-search': '2.2.1' // Not in dev host
+                }
+            };
+            const devHostPkg = {
+                name: 'echo-dev-host',
+                dependencies: {
+                    '@equinor/echo-core': '2.0.1'
+                }
+            };
+            mockedFs.readJsonSync.mockImplementation((filePath) => {
+                if (filePath.includes('my-echo-app'))
+                    return consumerPkg;
+                if (filePath === devHostPkgPath)
+                    return devHostPkg;
+                throw new Error(`Unexpected file path: ${filePath}`);
+            });
+            // Act
+            const result = await syncDevHostToConsumerVersions({
+                appPkgPath: '/path/to/my-echo-app/package.json',
+                tmpDevHostFolder
+            });
+            // Assert
+            expect(result).toEqual({
+                '@equinor/echo-core': '2.2.1',
+                '@equinor/echo-search': '2.2.1'
+            });
+            expect(mockedFs.writeJsonSync).toHaveBeenCalledWith(devHostPkgPath, expect.objectContaining({
+                dependencies: {
+                    '@equinor/echo-core': '2.2.1',
+                    '@equinor/echo-search': '2.2.1'
+                }
+            }), { spaces: 4 });
+        });
+    });
+});
+//# sourceMappingURL=buildAndCopyDevHost.test.js.map

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

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

package/lib/utils/merge.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/{__test__/utils/merg.test.js → utils/merge.test.js}

@@ -1,4 +1,4 @@
-import { merge } from '../../utils/merge.js';
+import { merge } from './merge.js';
 describe('merge function tests', () => {
     it('should merge arrays of arrays ', () => {
         const arr1 = [1, 2, 3];
@@ -26,4 +26,4 @@ describe('merge function tests', () => {
         expect(result).toEqual(arr2);
     });
 });
-//# sourceMappingURL=merg.test.js.map
+//# sourceMappingURL=merge.test.js.map

package/lib/utils/merge.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.test.js","sourceRoot":"","sources":["../../src/utils/merge.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IAClC,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,MAAM,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACvB,MAAM,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACvB,MAAM,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAEvB,MAAM,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAE1C,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACjC,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE;QACvB,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC;QACjB,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@equinor/echo-cli",
-    "version": "2.1.0-beta-0",
+    "version": "2.1.0-beta-1",
     "description": "Command line interface for Echo Apps",
     "main": "dist/index.js",
     "source": "src/test.js",
@@ -18,8 +18,8 @@
         "echo-update-version": "echo-update -v",
         "echo-update-next": "echo-update -c",
         "echo-update-all": "echo-update -a",
-        "test": "jest",
-        "build": "tsc && node copy-dev-host.cjs",
+        "test": "tsc && tsc --project tsconfig.test.json && jest",
+        "build": "npm test && node copy-dev-host.cjs",
         "lint": "eslint --color",
         "cli-publish": "npm run build",
         "postcli-publish": "npm run echo-publish"
@@ -33,7 +33,8 @@
         "echo-build": "./lib/echo-build.js",
         "echo-manifest": "./lib/echo-manifest.js",
         "build-echo-dev-host": "./lib/echo-build-dev-host.js",
-        "update-echo-libs": "./lib/update-echo-libs.js"
+        "update-echo-libs": "./lib/update-echo-libs.js",
+        "sync-dev-host-to-app": "./lib/sync-dev-host-to-app.js"
     },
     "files": [
         "lib",

package/lib/__test__/utils/merg.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"merg.test.js","sourceRoot":"","sources":["../../../src/__test__/utils/merg.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAE7C,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IAClC,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,MAAM,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACvB,MAAM,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACvB,MAAM,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAEvB,MAAM,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAE1C,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACvC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACjC,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE;QACvB,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC;QACjB,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}