@lwc/lwc-dev-server 10.4.0 → 10.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/server/connection/client.d.ts +0 -4
- package/dist/server/connection/client.js +8 -26
- package/dist/server/connection/client.js.map +1 -1
- package/dist/server/connection/client.spec.js +2 -21
- package/dist/server/connection/client.spec.js.map +1 -1
- package/dist/server/index.d.ts +0 -2
- package/dist/server/index.js +5 -15
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.spec.js +10 -18
- package/dist/server/index.spec.js.map +1 -1
- package/dist/server/moduleGraph/index.d.ts +11 -13
- package/dist/server/moduleGraph/index.js +32 -29
- package/dist/server/moduleGraph/index.js.map +1 -1
- package/dist/server/moduleGraph/index.spec.js +6 -8
- package/dist/server/moduleGraph/index.spec.js.map +1 -1
- package/package.json +4 -4
|
@@ -16,10 +16,6 @@ export declare class Client {
|
|
|
16
16
|
ctx: DevServerContext;
|
|
17
17
|
constructor(clientId: string, url: string, connection: Connection, ctx: DevServerContext);
|
|
18
18
|
onClose(callback: () => void): void;
|
|
19
|
-
addActivePaths(paths: {
|
|
20
|
-
modulePath: string;
|
|
21
|
-
compileOptions: TransformOptions;
|
|
22
|
-
}[]): void;
|
|
23
19
|
removeStalePaths(paths: string[]): void;
|
|
24
20
|
getCompileOptions(path: string): TransformOptions | undefined;
|
|
25
21
|
send(data: HMR_Data): void;
|
|
@@ -26,14 +26,6 @@ export class Client {
|
|
|
26
26
|
onClose(callback) {
|
|
27
27
|
this.connection.onClose(callback);
|
|
28
28
|
}
|
|
29
|
-
addActivePaths(paths) {
|
|
30
|
-
paths.forEach(({ modulePath, compileOptions }) => {
|
|
31
|
-
const existing = this.activePaths.get(modulePath);
|
|
32
|
-
if (!existing) {
|
|
33
|
-
this.activePaths.set(modulePath, compileOptions);
|
|
34
|
-
}
|
|
35
|
-
});
|
|
36
|
-
}
|
|
37
29
|
removeStalePaths(paths) {
|
|
38
30
|
paths.forEach((p) => this.activePaths.delete(p));
|
|
39
31
|
}
|
|
@@ -90,27 +82,17 @@ export class Client {
|
|
|
90
82
|
break;
|
|
91
83
|
}
|
|
92
84
|
case 'register': {
|
|
93
|
-
const
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
.reduce((acc, modulePath) => {
|
|
98
|
-
// Get the nearest boundary of the changed module
|
|
99
|
-
acc.add(moduleGraph.getModuleBoundary(modulePath));
|
|
100
|
-
return acc;
|
|
101
|
-
}, new Set());
|
|
102
|
-
this.addActivePaths(moduleRegistration.data.modules.map(({ modulePath, compileOptions, hash: _hash }) => {
|
|
103
|
-
return { modulePath, compileOptions };
|
|
104
|
-
}));
|
|
85
|
+
const modules = data.data.modules;
|
|
86
|
+
for (const { modulePath, compileOptions } of modules) {
|
|
87
|
+
this.activePaths.set(modulePath, compileOptions);
|
|
88
|
+
}
|
|
105
89
|
// Inform the hmr-client of available updates, this ensures that any local changes
|
|
106
90
|
// that haven't been deployed to the remote app are updated upon client registration.
|
|
107
|
-
const
|
|
91
|
+
const staleModules = moduleGraph.getStaleModules(modules);
|
|
92
|
+
this.send({
|
|
108
93
|
type: 'update',
|
|
109
|
-
data: Array.from(staleModules).map((modulePath) => {
|
|
110
|
-
|
|
111
|
-
}),
|
|
112
|
-
};
|
|
113
|
-
this.send(availableUpdates);
|
|
94
|
+
data: Array.from(staleModules).map((modulePath) => ({ modulePath })),
|
|
95
|
+
});
|
|
114
96
|
break;
|
|
115
97
|
}
|
|
116
98
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/server/connection/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAKvD,MAAM,2BAA2B,GAA0B,IAAI,GAAG,CAAC;IAC/D,QAAQ;IACR,eAAe;IACf,eAAe;IACf,OAAO;IACP,eAAe;CAClB,CAAC,CAAC;AACH,MAAM,0BAA0B,GAA0B,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;AAEzF;;;;;GAKG;AACH,MAAM,OAAO,MAAM;IAMf,YAAY,QAAgB,EAAE,GAAW,EAAE,UAAsB,EAAE,GAAqB;QAHxF,gBAAW,GAAkC,IAAI,GAAG,EAAE,CAAC;QAInD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACnB,CAAC;IAED,OAAO,CAAC,QAAoB;QACxB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/server/connection/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ describe('Client', () => {
|
|
|
14
14
|
getFileByModulePath: vi.fn(),
|
|
15
15
|
registerActivePaths: vi.fn(),
|
|
16
16
|
getModuleBoundary: vi.fn(),
|
|
17
|
+
getStaleModules: vi.fn().mockReturnValue(['stale-module']),
|
|
17
18
|
};
|
|
18
19
|
const mockLogger = {
|
|
19
20
|
log: vi.fn(),
|
|
@@ -47,25 +48,6 @@ describe('Client', () => {
|
|
|
47
48
|
expect(client.ctx).toBe(mockCtx);
|
|
48
49
|
expect(mockConnection.receive).toHaveBeenCalled();
|
|
49
50
|
});
|
|
50
|
-
it('should add active paths', () => {
|
|
51
|
-
const paths = [{ modulePath: 'path1', compileOptions: {} }];
|
|
52
|
-
client.addActivePaths(paths);
|
|
53
|
-
expect(client.activePaths.get('path1')).toEqual(paths[0].compileOptions);
|
|
54
|
-
});
|
|
55
|
-
it('should not override existing active paths', () => {
|
|
56
|
-
const initialPath = 'path1';
|
|
57
|
-
const paths = [{ modulePath: initialPath, compileOptions: {} }];
|
|
58
|
-
client.addActivePaths(paths);
|
|
59
|
-
const newPaths = [{ modulePath: initialPath, compileOptions: {} }];
|
|
60
|
-
client.addActivePaths(newPaths);
|
|
61
|
-
expect(client.activePaths.get(initialPath)).toEqual(paths[0].compileOptions);
|
|
62
|
-
});
|
|
63
|
-
it('should remove stale paths', () => {
|
|
64
|
-
const paths = [{ modulePath: 'path1', compileOptions: {} }];
|
|
65
|
-
client.addActivePaths(paths);
|
|
66
|
-
client.removeStalePaths(['path1']);
|
|
67
|
-
expect(client.activePaths.has('path1')).toBe(false);
|
|
68
|
-
});
|
|
69
51
|
it('should send data when allowed', () => {
|
|
70
52
|
const data = { type: 'update', data: [] };
|
|
71
53
|
client.send(data);
|
|
@@ -91,12 +73,11 @@ describe('Client', () => {
|
|
|
91
73
|
data: { modules: [{ modulePath: 'path1', compileOptions: {}, hash: '0' }] },
|
|
92
74
|
};
|
|
93
75
|
mockModuleGraph.registerActivePaths.mockReturnValue(['path1']);
|
|
94
|
-
mockModuleGraph.getModuleBoundary.mockReturnValue('boundary1');
|
|
95
76
|
await client.messageCallback(data);
|
|
96
77
|
expect(client.activePaths.get('path1')).toEqual({});
|
|
97
78
|
expect(mockConnection.send).toHaveBeenCalledWith({
|
|
98
79
|
type: 'update',
|
|
99
|
-
data: [{ modulePath: '
|
|
80
|
+
data: [{ modulePath: 'stale-module' }],
|
|
100
81
|
});
|
|
101
82
|
});
|
|
102
83
|
it('should close the connection', () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.spec.js","sourceRoot":"","sources":["../../../src/server/connection/client.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAE9D,OAAO,EAAE,QAAQ,EAAgB,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"client.spec.js","sourceRoot":"","sources":["../../../src/server/connection/client.spec.ts"],"names":[],"mappings":"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"}
|
package/dist/server/index.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { FSWatcher } from 'chokidar';
|
|
2
1
|
import { DevServerContext, type Logger, type ServerConfig } from '../types/index.js';
|
|
3
2
|
import { AuthenticatedWebSocketServer } from './connection/web-socket-server.js';
|
|
4
3
|
import { Client } from './connection/client.js';
|
|
@@ -12,7 +11,6 @@ import { Client } from './connection/client.js';
|
|
|
12
11
|
* This class also manages resources that will need clean up, like the file watcher, WebSockets.
|
|
13
12
|
*/
|
|
14
13
|
export declare class LWCServer {
|
|
15
|
-
watcher: FSWatcher;
|
|
16
14
|
clients: Set<Client>;
|
|
17
15
|
wss: AuthenticatedWebSocketServer;
|
|
18
16
|
context: DevServerContext;
|
package/dist/server/index.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { LogLevel } from '../types/index.js';
|
|
2
|
-
import { startWatch } from './watcher/index.js';
|
|
3
2
|
import { AuthenticatedWebSocketServer } from './connection/web-socket-server.js';
|
|
4
3
|
import { ModuleGraph } from './moduleGraph/index.js';
|
|
5
4
|
import ConsoleLogger from './consoleLogger.js';
|
|
@@ -23,7 +22,6 @@ export class LWCServer {
|
|
|
23
22
|
};
|
|
24
23
|
// Dev Server to manage critical assets, allows them to be closed and avoid memory leaks
|
|
25
24
|
this.wss = wss;
|
|
26
|
-
this.watcher = startWatch(config.paths);
|
|
27
25
|
this.wss.onNewConnection((connection, url) => {
|
|
28
26
|
if (config.maxClientCount && this.clients.size >= config.maxClientCount) {
|
|
29
27
|
logger.log(LogLevel.error, `[LWC Dev Server] Max connection limit(${this.context.config.maxClientCount}) reached, ignoring new requests until existing connections are closed`);
|
|
@@ -45,23 +43,15 @@ export class LWCServer {
|
|
|
45
43
|
clientCount: this.clients.size,
|
|
46
44
|
});
|
|
47
45
|
});
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
});
|
|
53
|
-
this.context = {
|
|
54
|
-
config,
|
|
55
|
-
logger,
|
|
56
|
-
moduleGraph: new ModuleGraph(config, logger, this.watcher, {
|
|
57
|
-
moduleUpdateHandler: this.moduleUpdateHandler,
|
|
58
|
-
}),
|
|
59
|
-
};
|
|
46
|
+
const moduleGraph = new ModuleGraph(config, logger);
|
|
47
|
+
moduleGraph.on('close', () => this.stopServer());
|
|
48
|
+
moduleGraph.on('update', this.moduleUpdateHandler.bind(this));
|
|
49
|
+
this.context = { config, logger, moduleGraph };
|
|
60
50
|
this.identityToken = config.identityToken;
|
|
61
51
|
}
|
|
62
52
|
stopServer() {
|
|
63
53
|
this.context.logger.log(LogLevel.info, '[LWC Dev Server] Stopping the dev server');
|
|
64
|
-
this.
|
|
54
|
+
this.context.moduleGraph.close();
|
|
65
55
|
this.wss.close();
|
|
66
56
|
this.context.logger.log(LogLevel.info, '[LWC Dev Server] Succesfully stopped dev server');
|
|
67
57
|
}
|
package/dist/server/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,22 +1,19 @@
|
|
|
1
|
-
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
2
|
-
import { FSWatcher } from 'chokidar';
|
|
3
1
|
import { LogLevel } from '../types/index.js';
|
|
4
2
|
import { LWCServer } from './index.js';
|
|
5
|
-
import { startWatch } from './watcher/index.js';
|
|
6
3
|
import { AuthenticatedWebSocketServer } from './connection/web-socket-server.js';
|
|
7
4
|
import { ModuleGraph } from './moduleGraph/index.js';
|
|
8
5
|
import ConsoleLogger from './consoleLogger.js';
|
|
9
6
|
import { Client } from './connection/client.js';
|
|
10
7
|
import { Connection } from './connection/connection.js';
|
|
11
|
-
vi.mock('chokidar', () => ({ FSWatcher: vi.fn(() => ({ on: vi.fn(), close: vi.fn() })) }));
|
|
12
|
-
vi.mock('./watcher/index.js', () => ({ startWatch: vi.fn(() => new FSWatcher()) }));
|
|
13
8
|
vi.mock('./connection/web-socket-server.js', () => ({
|
|
14
9
|
AuthenticatedWebSocketServer: vi.fn(() => ({
|
|
15
10
|
onNewConnection: vi.fn(),
|
|
16
11
|
close: vi.fn(),
|
|
17
12
|
})),
|
|
18
13
|
}));
|
|
19
|
-
vi.mock('./moduleGraph/index.js', () => ({
|
|
14
|
+
vi.mock('./moduleGraph/index.js', () => ({
|
|
15
|
+
ModuleGraph: vi.fn().mockReturnValue({ on: vi.fn(), close: vi.fn() }),
|
|
16
|
+
}));
|
|
20
17
|
vi.mock('./consoleLogger.js');
|
|
21
18
|
vi.mock('./connection/client.js', () => ({
|
|
22
19
|
Client: vi.fn(() => ({ onClose: vi.fn(), send: vi.fn() })),
|
|
@@ -42,10 +39,7 @@ describe('LWCServer', () => {
|
|
|
42
39
|
vi.clearAllMocks();
|
|
43
40
|
});
|
|
44
41
|
it('should initialize the server with correct components', () => {
|
|
45
|
-
expect(
|
|
46
|
-
expect(ModuleGraph).toHaveBeenCalledWith(config, logger, lwcServer.watcher, {
|
|
47
|
-
moduleUpdateHandler: lwcServer.moduleUpdateHandler,
|
|
48
|
-
});
|
|
42
|
+
expect(ModuleGraph).toHaveBeenCalledWith(config, logger);
|
|
49
43
|
});
|
|
50
44
|
it('should handle new connections and enforce max client limit', () => {
|
|
51
45
|
const mockUrl = 'ws://localhost';
|
|
@@ -61,20 +55,18 @@ describe('LWCServer', () => {
|
|
|
61
55
|
expect(connection.close).toHaveBeenCalledTimes(1); // Third connection should be closed
|
|
62
56
|
expect(lwcServer.clients.size).toBe(2);
|
|
63
57
|
});
|
|
64
|
-
it('should
|
|
65
|
-
const mockErrorEvent = { message: 'File watcher error' };
|
|
58
|
+
it('should close and stop server when moduleGraph closes', () => {
|
|
66
59
|
const onError = vi
|
|
67
|
-
.mocked(lwcServer.
|
|
68
|
-
.on.mock.calls.find(([eventName]) => eventName === '
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
expect(logger.log).toHaveBeenCalledWith(LogLevel.debug, `[LWC Dev Server] File watcher error: ${mockErrorEvent.message}`);
|
|
60
|
+
.mocked(lwcServer.context.moduleGraph)
|
|
61
|
+
.on.mock.calls.find(([eventName]) => eventName === 'close')[1];
|
|
62
|
+
//@ts-ignore can't fix :(
|
|
63
|
+
onError();
|
|
72
64
|
expect(wss.close).toHaveBeenCalled();
|
|
73
65
|
});
|
|
74
66
|
it('should stop the server and release resources', () => {
|
|
75
67
|
lwcServer.stopServer();
|
|
76
68
|
expect(logger.log).toHaveBeenCalledWith(LogLevel.info, '[LWC Dev Server] Stopping the dev server');
|
|
77
|
-
expect(lwcServer.
|
|
69
|
+
expect(lwcServer.context.moduleGraph.close).toHaveBeenCalled();
|
|
78
70
|
expect(lwcServer.wss.close).toHaveBeenCalled();
|
|
79
71
|
expect(logger.log).toHaveBeenCalledWith(LogLevel.info, '[LWC Dev Server] Succesfully stopped dev server');
|
|
80
72
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.spec.js","sourceRoot":"","sources":["../../src/server/index.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"index.spec.js","sourceRoot":"","sources":["../../src/server/index.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,15 @@
|
|
|
1
|
+
import { EventEmitter } from 'events';
|
|
1
2
|
import { FSWatcher } from 'chokidar';
|
|
2
3
|
import { ServerConfig, type Logger } from '../../types/index.js';
|
|
3
|
-
import type {
|
|
4
|
+
import type { Module_State } from '@lwc/lwc-dev-server-types';
|
|
4
5
|
import type { ModuleInfo, ModuleMapEntry, WorkspaceScanner } from './workspaceScanner/scanner';
|
|
5
6
|
import type { BundleFiles } from '@lwc/sfdc-lwc-compiler/dist/compile.js';
|
|
6
7
|
export type Module = any;
|
|
7
|
-
export interface
|
|
8
|
-
|
|
8
|
+
export interface EventMap {
|
|
9
|
+
update: [string];
|
|
10
|
+
close: [];
|
|
9
11
|
}
|
|
10
|
-
export declare class ModuleGraph {
|
|
12
|
+
export declare class ModuleGraph extends EventEmitter<EventMap> {
|
|
11
13
|
logger: Logger;
|
|
12
14
|
watcher: FSWatcher;
|
|
13
15
|
workspaceScanner: WorkspaceScanner;
|
|
@@ -15,27 +17,22 @@ export declare class ModuleGraph {
|
|
|
15
17
|
* All LWC modules and their parts with absolute file paths, for the current workspace.
|
|
16
18
|
*/
|
|
17
19
|
moduleMap: Map<string, ModuleMapEntry>;
|
|
18
|
-
/**
|
|
19
|
-
* All modules paths that are being used by the various client connections
|
|
20
|
-
*/
|
|
21
|
-
activeModulePaths: string[];
|
|
22
20
|
fileToModulePathMap: {
|
|
23
21
|
[key: string]: string;
|
|
24
22
|
};
|
|
25
23
|
modulePathToModuleInfo: {
|
|
26
24
|
[key: string]: ModuleInfo;
|
|
27
25
|
};
|
|
28
|
-
|
|
29
|
-
constructor(config: ServerConfig, logger: Logger, watcher: FSWatcher, moduleChangeCallbacks: ModuleChangeCallbacks);
|
|
26
|
+
constructor(config: ServerConfig, logger: Logger);
|
|
30
27
|
init(): void;
|
|
31
28
|
getModulePathByFile(path: string): string | undefined;
|
|
32
29
|
getFileByModulePath(modulePath: string): string | undefined;
|
|
33
30
|
/**
|
|
34
|
-
*
|
|
35
|
-
* @param
|
|
31
|
+
* Gets the stale modules from the list of modules
|
|
32
|
+
* @param modules
|
|
36
33
|
* @returns Modules paths that are determined to be stale wrt the content monitored by the dev server
|
|
37
34
|
*/
|
|
38
|
-
|
|
35
|
+
getStaleModules(modules: Module_State[]): Set<string>;
|
|
39
36
|
fileChangeHandler(filePath: string): void;
|
|
40
37
|
/**
|
|
41
38
|
* Identify which modulePath that represents the boundary of the changed module.
|
|
@@ -59,4 +56,5 @@ export declare class ModuleGraph {
|
|
|
59
56
|
* @returns
|
|
60
57
|
*/
|
|
61
58
|
getModuleFiles(name: string, namespace: string, modulePath: string): BundleFiles;
|
|
59
|
+
close(): void;
|
|
62
60
|
}
|
|
@@ -1,25 +1,23 @@
|
|
|
1
1
|
import fs from 'fs';
|
|
2
2
|
import path from 'path';
|
|
3
|
+
import { EventEmitter } from 'events';
|
|
3
4
|
import { LogLevel } from '../../types/index.js';
|
|
4
5
|
import { getModuleHash } from '../util/fileUtil.js';
|
|
6
|
+
import { startWatch } from '../watcher/index.js';
|
|
5
7
|
import { getWorkspaceScanner } from './workspaceScanner/index.js';
|
|
6
|
-
export class ModuleGraph {
|
|
7
|
-
constructor(config, logger
|
|
8
|
+
export class ModuleGraph extends EventEmitter {
|
|
9
|
+
constructor(config, logger) {
|
|
10
|
+
super();
|
|
8
11
|
/**
|
|
9
12
|
* All LWC modules and their parts with absolute file paths, for the current workspace.
|
|
10
13
|
*/
|
|
11
14
|
this.moduleMap = new Map();
|
|
12
|
-
/**
|
|
13
|
-
* All modules paths that are being used by the various client connections
|
|
14
|
-
*/
|
|
15
|
-
this.activeModulePaths = [];
|
|
16
15
|
// Mapping from <absolute file path> => "<namespace>/<componentname>/component.js"
|
|
17
16
|
this.fileToModulePathMap = Object.create(null);
|
|
18
17
|
// Mapping from "<namespace>/<componentname>/component.js" => { moduleFilePath, moduleSourceHash }
|
|
19
18
|
this.modulePathToModuleInfo = Object.create(null);
|
|
20
|
-
this.watcher =
|
|
19
|
+
this.watcher = startWatch(config.paths);
|
|
21
20
|
this.logger = logger;
|
|
22
|
-
this.moduleChangeCallbacks = moduleChangeCallbacks;
|
|
23
21
|
this.workspaceScanner = getWorkspaceScanner(config, logger);
|
|
24
22
|
// init() may be called multiple times in the future(when a directory is deleted or addeds)
|
|
25
23
|
this.init();
|
|
@@ -39,6 +37,11 @@ export class ModuleGraph {
|
|
|
39
37
|
}
|
|
40
38
|
});
|
|
41
39
|
this.watcher.on('change', this.fileChangeHandler.bind(this));
|
|
40
|
+
this.watcher.on('error', (event) => {
|
|
41
|
+
this.logger.log(LogLevel.error, '[LWC Dev Server] Encountered error while watching files');
|
|
42
|
+
this.logger.log(LogLevel.debug, `[LWC Dev Server] File watcher error: ${event.message}`);
|
|
43
|
+
this.emit('close');
|
|
44
|
+
});
|
|
42
45
|
}
|
|
43
46
|
// Given absolute file path, get the modulePath
|
|
44
47
|
// Mapping from <absolute file path> => "<namespace>/<componentname>/component.js"
|
|
@@ -50,37 +53,34 @@ export class ModuleGraph {
|
|
|
50
53
|
return this.modulePathToModuleInfo[modulePath]?.moduleFilePath;
|
|
51
54
|
}
|
|
52
55
|
/**
|
|
53
|
-
*
|
|
54
|
-
* @param
|
|
56
|
+
* Gets the stale modules from the list of modules
|
|
57
|
+
* @param modules
|
|
55
58
|
* @returns Modules paths that are determined to be stale wrt the content monitored by the dev server
|
|
56
59
|
*/
|
|
57
|
-
|
|
58
|
-
const { data: { modules: activeModules }, } = moduleRegistration;
|
|
60
|
+
getStaleModules(modules) {
|
|
59
61
|
const staleModules = [];
|
|
60
62
|
const unTrackedModules = [];
|
|
61
|
-
|
|
63
|
+
modules.forEach((mod) => {
|
|
62
64
|
const { modulePath, hash } = mod;
|
|
63
|
-
if (modulePath.trim())
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
staleModules.push(modulePath);
|
|
72
|
-
}
|
|
73
|
-
}
|
|
65
|
+
if (!modulePath.trim())
|
|
66
|
+
return;
|
|
67
|
+
const moduleInfo = this.modulePathToModuleInfo[modulePath];
|
|
68
|
+
if (!moduleInfo) {
|
|
69
|
+
unTrackedModules.push(modulePath);
|
|
70
|
+
}
|
|
71
|
+
else if (moduleInfo.moduleSourceHash !== hash) {
|
|
72
|
+
staleModules.push(modulePath);
|
|
74
73
|
}
|
|
75
74
|
});
|
|
76
75
|
unTrackedModules.length &&
|
|
77
76
|
this.logger.log(LogLevel.verbose, `[Module Graph] Following modules are unknown to dev server: \n\t ${unTrackedModules.join(',\n\t')}`);
|
|
78
77
|
staleModules.length &&
|
|
79
78
|
this.logger.log(LogLevel.debug, `[Module Graph] Following modules have a newer version: \n\t ${staleModules.join(',\n\t')}`);
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
79
|
+
const staleModuleBoundaries = new Set();
|
|
80
|
+
for (const path of staleModules) {
|
|
81
|
+
staleModuleBoundaries.add(this.getModuleBoundary(path));
|
|
82
|
+
}
|
|
83
|
+
return staleModuleBoundaries;
|
|
84
84
|
}
|
|
85
85
|
fileChangeHandler(filePath) {
|
|
86
86
|
const changedFile = path.resolve(filePath);
|
|
@@ -98,7 +98,7 @@ export class ModuleGraph {
|
|
|
98
98
|
// Find the nearest boundary for the file that changed
|
|
99
99
|
const moduleBoundary = this.getModuleBoundary(modulePath);
|
|
100
100
|
// Notify the clients that a module has been updated
|
|
101
|
-
this.
|
|
101
|
+
this.emit('update', moduleBoundary);
|
|
102
102
|
}
|
|
103
103
|
/**
|
|
104
104
|
* Identify which modulePath that represents the boundary of the changed module.
|
|
@@ -166,5 +166,8 @@ export class ModuleGraph {
|
|
|
166
166
|
}
|
|
167
167
|
throw new Error(`[LWC Dev Server] Unable to determine source for '${modulePath}'`);
|
|
168
168
|
}
|
|
169
|
+
close() {
|
|
170
|
+
this.watcher.close();
|
|
171
|
+
}
|
|
169
172
|
}
|
|
170
173
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/moduleGraph/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/moduleGraph/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,11 +29,7 @@ describe('ModuleGraph', () => {
|
|
|
29
29
|
const mockLogger = {
|
|
30
30
|
log: vi.fn(),
|
|
31
31
|
};
|
|
32
|
-
|
|
33
|
-
const mockWatcher = watch();
|
|
34
|
-
const mockCallbacks = {
|
|
35
|
-
moduleUpdateHandler: vi.fn(),
|
|
36
|
-
};
|
|
32
|
+
const moduleUpdateHandler = vi.fn();
|
|
37
33
|
beforeEach(() => {
|
|
38
34
|
moduleGraph = new ModuleGraph({
|
|
39
35
|
logLevel: LogLevel.debug,
|
|
@@ -41,7 +37,8 @@ describe('ModuleGraph', () => {
|
|
|
41
37
|
port: 50182,
|
|
42
38
|
rootDir: __dirname,
|
|
43
39
|
workspace: Workspace.Mrt,
|
|
44
|
-
}, mockLogger
|
|
40
|
+
}, mockLogger);
|
|
41
|
+
moduleGraph.on('update', moduleUpdateHandler);
|
|
45
42
|
});
|
|
46
43
|
afterEach(() => {
|
|
47
44
|
vi.clearAllMocks();
|
|
@@ -53,8 +50,9 @@ describe('ModuleGraph', () => {
|
|
|
53
50
|
it('should handle file changes correctly', () => {
|
|
54
51
|
const mockFilePath = path.resolve(modulesPath, 'ns/comp/comp.js');
|
|
55
52
|
vi.mocked(getModuleHash).mockReturnValueOnce('changed hash');
|
|
56
|
-
|
|
57
|
-
|
|
53
|
+
// @ts-expect-error watch is mocked
|
|
54
|
+
vi.mocked(watch()).on.mock.calls[0][1](mockFilePath);
|
|
55
|
+
expect(moduleUpdateHandler).toHaveBeenCalled();
|
|
58
56
|
});
|
|
59
57
|
it('should throw an error for unrecognized file types in getModuleBoundary', () => {
|
|
60
58
|
expect(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.spec.js","sourceRoot":"","sources":["../../../src/server/moduleGraph/index.spec.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,+CAA+C,CAAC,CAAC;AAE7F,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AAC1B,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IACrC,OAAO;QACH,GAAG,CAAC,MAAM,cAAc,EAAyB,CAAC;QAClD,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;KACnB,CAAC;AACN,CAAC,CAAC,CAAC;AACH,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;IACvB,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;QAC3B,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE;QACX,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;KACjB,CAAC;CACL,CAAC,CAAC,CAAC;AACJ,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IACpD,OAAO;QACH,GAAG,CAAC,MAAM,cAAc,EAAwC,CAAC;QACjE,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE;KACzB,CAAC;AACN,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IACzB,IAAI,WAAwB,CAAC;IAC7B,MAAM,UAAU,GAAG;QACf,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE;KACf,CAAC;IACF,
|
|
1
|
+
{"version":3,"file":"index.spec.js","sourceRoot":"","sources":["../../../src/server/moduleGraph/index.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lwc/lwc-dev-server",
|
|
3
3
|
"description": "A development server to get quick feedback on your LWC component development.",
|
|
4
|
-
"version": "10.
|
|
4
|
+
"version": "10.5.1",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"lwc dev server"
|
|
7
7
|
],
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"start": "node ./bin/dev-server.js start"
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@lwc/sfdc-lwc-compiler": "10.
|
|
22
|
+
"@lwc/sfdc-lwc-compiler": "10.5.1",
|
|
23
23
|
"chalk": "~5.3.0",
|
|
24
24
|
"chokidar": "~3.6.0",
|
|
25
25
|
"commander": "~10.0.0",
|
|
@@ -27,8 +27,8 @@
|
|
|
27
27
|
"ws": "^8.18.0"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
|
-
"@lwc/lwc-dev-server-types": "10.
|
|
31
|
-
"@salesforce/core": "
|
|
30
|
+
"@lwc/lwc-dev-server-types": "10.5.1",
|
|
31
|
+
"@salesforce/core": "^8.6.1",
|
|
32
32
|
"@types/ws": "^8.5.10"
|
|
33
33
|
},
|
|
34
34
|
"peerDependencies": {
|