@lwc/lwc-dev-server 9.0.1-alpha.0 → 9.2.0
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.js +11 -7
- package/dist/server/connection/client.js.map +1 -1
- package/dist/server/moduleGraph/index.js +3 -3
- package/dist/server/moduleGraph/index.js.map +1 -1
- package/package.json +4 -4
- package/dist/server/connection/clientConnection.d.ts +0 -19
- package/dist/server/connection/clientConnection.js +0 -30
- package/dist/server/connection/clientConnection.js.map +0 -1
- package/dist/server/connection/index.d.ts +0 -28
- package/dist/server/connection/index.js +0 -73
- package/dist/server/connection/index.js.map +0 -1
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import path from 'node:path';
|
|
2
1
|
import { compile } from '../bundler/lexBundler.js';
|
|
3
2
|
import { LogLevel } from '../../types/serverConfig.js';
|
|
4
3
|
const ALLOWED_OUTBOUND_DATA_TYPES = new Set([
|
|
@@ -8,7 +7,6 @@ const ALLOWED_OUTBOUND_DATA_TYPES = new Set([
|
|
|
8
7
|
'error',
|
|
9
8
|
]);
|
|
10
9
|
const ALLOWED_INBOUND_DATA_TYPES = new Set(['fetch', 'register']);
|
|
11
|
-
const SUPPORTED_FETCH_EXTENSIONS = new Set(['.html', '.css', '.js']);
|
|
12
10
|
/**
|
|
13
11
|
* Class representing a client that has connected to the dev server.
|
|
14
12
|
* This class represents a client that is connected and ready to receive hot module updates.
|
|
@@ -85,16 +83,22 @@ export class Client {
|
|
|
85
83
|
}
|
|
86
84
|
case 'register': {
|
|
87
85
|
const moduleRegistration = data;
|
|
88
|
-
|
|
86
|
+
// Register active paths and determine which modules in the client are stale
|
|
87
|
+
const staleModules = moduleGraph
|
|
88
|
+
.registerActivePaths(moduleRegistration)
|
|
89
|
+
.reduce((acc, modulePath) => {
|
|
90
|
+
// Get the nearest boundary of the changed module
|
|
91
|
+
acc.add(moduleGraph.getModuleBoundary(modulePath));
|
|
92
|
+
return acc;
|
|
93
|
+
}, new Set());
|
|
89
94
|
this.addActivePaths(moduleRegistration.data.modules.map(({ modulePath, compileOptions, hash: _hash }) => {
|
|
90
95
|
return { modulePath, compileOptions };
|
|
91
96
|
}));
|
|
97
|
+
// Inform the hmr-client of available updates, this ensures that any local changes
|
|
98
|
+
// that haven't been deployed to the remote app are updated upon client registration.
|
|
92
99
|
const availableUpdates = {
|
|
93
100
|
type: 'update',
|
|
94
|
-
data: staleModules
|
|
95
|
-
// This is a hack until we add support for javascript hot module reloading
|
|
96
|
-
.filter((modulePath) => SUPPORTED_FETCH_EXTENSIONS.has(path.extname(modulePath)))
|
|
97
|
-
.map((modulePath) => {
|
|
101
|
+
data: Array.from(staleModules).map((modulePath) => {
|
|
98
102
|
return { modulePath };
|
|
99
103
|
}),
|
|
100
104
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/server/connection/client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/server/connection/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,7 +59,7 @@ export class ModuleGraph {
|
|
|
59
59
|
const staleModules = [];
|
|
60
60
|
const unTrackedModules = [];
|
|
61
61
|
activeModules.forEach((mod) => {
|
|
62
|
-
const { modulePath, hash
|
|
62
|
+
const { modulePath, hash } = mod;
|
|
63
63
|
if (modulePath.trim()) {
|
|
64
64
|
const moduleInfo = this.modulePathToModuleInfo[modulePath];
|
|
65
65
|
if (!moduleInfo) {
|
|
@@ -67,14 +67,14 @@ export class ModuleGraph {
|
|
|
67
67
|
}
|
|
68
68
|
else {
|
|
69
69
|
this.activeModulePaths.push(modulePath);
|
|
70
|
-
if (moduleInfo.moduleSourceHash !==
|
|
70
|
+
if (moduleInfo.moduleSourceHash !== hash) {
|
|
71
71
|
staleModules.push(modulePath);
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
75
|
});
|
|
76
76
|
unTrackedModules.length &&
|
|
77
|
-
this.logger.log(LogLevel.
|
|
77
|
+
this.logger.log(LogLevel.verbose, `[Module Graph] Following modules are unknown to dev server: \n\t ${unTrackedModules.join(',\n\t')}`);
|
|
78
78
|
staleModules.length &&
|
|
79
79
|
this.logger.log(LogLevel.debug, `[Module Graph] Following modules have a newer version: \n\t ${staleModules.join(',\n\t')}`);
|
|
80
80
|
// TODO: Before returning staleModules, the list can be trimmed based on module boundary
|
|
@@ -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;AAGxB,OAAO,EAAE,QAAQ,EAA6B,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAYlE,MAAM,OAAO,WAAW;IAmBpB,YACI,MAAoB,EACpB,MAAc,EACd,OAAkB,EAClB,qBAA4C;QAnBhD;;WAEG;QACH,cAAS,GAAgC,IAAI,GAAG,EAAE,CAAC;QACnD;;WAEG;QACH,sBAAiB,GAAa,EAAE,CAAC;QAEjC,kFAAkF;QAClF,wBAAmB,GAA8B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACrE,kGAAkG;QAClG,2BAAsB,GAAkC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QASxE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;QAEnD,IAAI,CAAC,gBAAgB,GAAG,mBAAmB,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAEpF,2FAA2F;QAC3F,IAAI,CAAC,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,IAAI;QACA,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,aAAa,EAAE,CAAC;QACvD,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,QAAQ,CAAC,KAAK,EACd,wBAAwB,IAAI,CAAC,SAAS,CAAC,IAAI,2CAA2C,CACzF,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,QAAQ,CAAC,KAAK,EACd,0GAA0G,CAC7G,CAAC;QACN,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE;YACvC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAAC;YACxD,KAAK,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;gBACjE,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,UAAU,CAAC;YACrE,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,+CAA+C;IAC/C,kFAAkF;IAClF,mBAAmB,CAAC,IAAY;QAC5B,OAAO,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IAED,mEAAmE;IACnE,mBAAmB,CAAC,UAAkB;QAClC,OAAO,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,EAAE,cAAc,CAAC;IACnE,CAAC;IAED;;;;OAIG;IACH,mBAAmB,CAAC,kBAAqC;QACrD,MAAM,EACF,IAAI,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,GACnC,GAAG,kBAAkB,CAAC;QACvB,MAAM,YAAY,GAAa,EAAE,CAAC;QAClC,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC1B,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/moduleGraph/index.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": "9.
|
|
4
|
+
"version": "9.2.0",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"lwc dev server"
|
|
7
7
|
],
|
|
@@ -23,18 +23,18 @@
|
|
|
23
23
|
"start": "node ./bin/dev-server.js start"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@lwc/sfdc-lwc-compiler": "9.
|
|
26
|
+
"@lwc/sfdc-lwc-compiler": "9.2.0",
|
|
27
27
|
"chalk": "~5.3.0",
|
|
28
28
|
"chokidar": "~3.6.0",
|
|
29
29
|
"commander": "~10.0.0",
|
|
30
30
|
"ws": "~8.16.0"
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
33
|
-
"@lwc/lwc-dev-server-types": "9.
|
|
33
|
+
"@lwc/lwc-dev-server-types": "9.2.0",
|
|
34
34
|
"@types/ws": "^8.5.10"
|
|
35
35
|
},
|
|
36
36
|
"peerDependencies": {
|
|
37
|
-
"@lwc/compiler": ">=
|
|
37
|
+
"@lwc/compiler": ">=7"
|
|
38
38
|
},
|
|
39
39
|
"engines": {
|
|
40
40
|
"node": ">=16"
|
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
import type { ClientTarget } from '@lwc/lwc-dev-server-types';
|
|
2
|
-
import type { TransformOptions } from '@lwc/compiler';
|
|
3
|
-
export declare const clientLookup: Map<string, ClientConnection>;
|
|
4
|
-
/**
|
|
5
|
-
* Class representing a client that has connected to the dev server
|
|
6
|
-
*/
|
|
7
|
-
export default class ClientConnection {
|
|
8
|
-
url: string;
|
|
9
|
-
target: ClientTarget;
|
|
10
|
-
activePaths: Map<string, TransformOptions>;
|
|
11
|
-
constructor(url: string, target: ClientTarget);
|
|
12
|
-
static getKey(url: string, target: ClientTarget): string;
|
|
13
|
-
addActivePaths(paths: {
|
|
14
|
-
modulePath: string;
|
|
15
|
-
compileOptions: TransformOptions;
|
|
16
|
-
}[]): void;
|
|
17
|
-
removeStalePaths(paths: string[]): void;
|
|
18
|
-
getCompileOptions(path: string): TransformOptions | undefined;
|
|
19
|
-
}
|
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
export const clientLookup = new Map();
|
|
2
|
-
/**
|
|
3
|
-
* Class representing a client that has connected to the dev server
|
|
4
|
-
*/
|
|
5
|
-
export default class ClientConnection {
|
|
6
|
-
constructor(url, target) {
|
|
7
|
-
this.activePaths = new Map();
|
|
8
|
-
this.url = url;
|
|
9
|
-
this.target = target;
|
|
10
|
-
clientLookup.set(ClientConnection.getKey(this.url, this.target), this);
|
|
11
|
-
}
|
|
12
|
-
static getKey(url, target) {
|
|
13
|
-
return `${url}:${target}`;
|
|
14
|
-
}
|
|
15
|
-
addActivePaths(paths) {
|
|
16
|
-
paths.forEach(({ modulePath, compileOptions }) => {
|
|
17
|
-
const existing = this.activePaths.get(modulePath);
|
|
18
|
-
if (!existing) {
|
|
19
|
-
this.activePaths.set(modulePath, compileOptions);
|
|
20
|
-
}
|
|
21
|
-
});
|
|
22
|
-
}
|
|
23
|
-
removeStalePaths(paths) {
|
|
24
|
-
paths.forEach((p) => this.activePaths.delete(p));
|
|
25
|
-
}
|
|
26
|
-
getCompileOptions(path) {
|
|
27
|
-
return this.activePaths.get(path);
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
//# sourceMappingURL=clientConnection.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"clientConnection.js","sourceRoot":"","sources":["../../../src/server/connection/clientConnection.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,YAAY,GAAkC,IAAI,GAAG,EAAE,CAAC;AAErE;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAIjC,YAAY,GAAW,EAAE,MAAoB;QAD7C,gBAAW,GAAkC,IAAI,GAAG,EAAE,CAAC;QAEnD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,YAAY,CAAC,GAAG,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;IAC3E,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,GAAW,EAAE,MAAoB;QAC3C,OAAO,GAAG,GAAG,IAAI,MAAM,EAAE,CAAC;IAC9B,CAAC;IAED,cAAc,CAAC,KAAiE;QAC5E,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,UAAU,EAAE,cAAc,EAAE,EAAE,EAAE;YAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAClD,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACZ,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;YACrD,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,gBAAgB,CAAC,KAAe;QAC5B,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,iBAAiB,CAAC,IAAY;QAC1B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;CACJ"}
|
|
@@ -1,28 +0,0 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
import { WebSocket } from 'ws';
|
|
3
|
-
import { Logger } from '../../types/index.js';
|
|
4
|
-
import type { HMR_Data } from '@lwc/lwc-dev-server-types';
|
|
5
|
-
export type Module = any;
|
|
6
|
-
export declare class Connection {
|
|
7
|
-
protocol: string;
|
|
8
|
-
host: string;
|
|
9
|
-
port: number;
|
|
10
|
-
logger: Logger;
|
|
11
|
-
httpsConfig?: Partial<{
|
|
12
|
-
cert: string;
|
|
13
|
-
key: string;
|
|
14
|
-
pfx: Buffer;
|
|
15
|
-
passphrase: string;
|
|
16
|
-
}> | undefined;
|
|
17
|
-
socket: WebSocket | undefined;
|
|
18
|
-
constructor(protocol: string, host: string, port: number, logger: Logger, httpsConfig?: Partial<{
|
|
19
|
-
cert: string;
|
|
20
|
-
key: string;
|
|
21
|
-
pfx: Buffer;
|
|
22
|
-
passphrase: string;
|
|
23
|
-
}> | undefined);
|
|
24
|
-
sendModule(modulePath: string, src: string): void;
|
|
25
|
-
initializeConnection(initCallback: () => void, messageCallback: (data: HMR_Data) => void): void;
|
|
26
|
-
send(data: HMR_Data): void;
|
|
27
|
-
close(): void;
|
|
28
|
-
}
|
|
@@ -1,73 +0,0 @@
|
|
|
1
|
-
/*
|
|
2
|
-
* Copyright (c) 2018, salesforce.com, inc.
|
|
3
|
-
* All rights reserved.
|
|
4
|
-
* SPDX-License-Identifier: MIT
|
|
5
|
-
* For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
|
|
6
|
-
*/
|
|
7
|
-
import * as http from 'http';
|
|
8
|
-
import * as https from 'https';
|
|
9
|
-
import { URL } from 'node:url';
|
|
10
|
-
import { WebSocketServer } from 'ws';
|
|
11
|
-
import { LogLevel } from '../../types/index.js';
|
|
12
|
-
export class Connection {
|
|
13
|
-
constructor(protocol, host, port, logger, httpsConfig) {
|
|
14
|
-
this.protocol = protocol;
|
|
15
|
-
this.host = host;
|
|
16
|
-
this.port = port;
|
|
17
|
-
this.logger = logger;
|
|
18
|
-
this.httpsConfig = httpsConfig;
|
|
19
|
-
}
|
|
20
|
-
sendModule(modulePath, src) {
|
|
21
|
-
this.send({
|
|
22
|
-
type: 'module-update',
|
|
23
|
-
data: [{ modulePath, src }],
|
|
24
|
-
});
|
|
25
|
-
}
|
|
26
|
-
initializeConnection(initCallback, messageCallback) {
|
|
27
|
-
const httpServer = this.httpsConfig
|
|
28
|
-
? https.createServer(this.httpsConfig)
|
|
29
|
-
: http.createServer();
|
|
30
|
-
httpServer.on('request', requestHandler);
|
|
31
|
-
try {
|
|
32
|
-
const wss = new WebSocketServer({ server: httpServer });
|
|
33
|
-
wss.on('connection', (ws) => {
|
|
34
|
-
initCallback();
|
|
35
|
-
this.socket = ws;
|
|
36
|
-
this.socket.addEventListener('message', ({ data }) => {
|
|
37
|
-
if (data && typeof data === 'string') {
|
|
38
|
-
// When there is an update, handle the incoming message and request an updated module
|
|
39
|
-
messageCallback(JSON.parse(data));
|
|
40
|
-
}
|
|
41
|
-
});
|
|
42
|
-
});
|
|
43
|
-
httpServer.listen(this.port);
|
|
44
|
-
this.logger.log(LogLevel.info, `LWC Dev Server started at port:${this.port}`);
|
|
45
|
-
}
|
|
46
|
-
catch (e) {
|
|
47
|
-
this.logger.log(LogLevel.error, `Failed to start a WebSocket server with the following error: ${e}`);
|
|
48
|
-
process.exit(1);
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
send(data) {
|
|
52
|
-
if (this.socket && this.socket.readyState === this.socket.OPEN) {
|
|
53
|
-
this.socket.send(JSON.stringify(data));
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
close() {
|
|
57
|
-
this.socket?.close();
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
function requestHandler(req, res) {
|
|
61
|
-
// the second arg could really be anything, we're just interested in searchParams
|
|
62
|
-
// also req.url can never be undefined, it's just bad typing
|
|
63
|
-
const url = new URL(req.url, 'http://localhost');
|
|
64
|
-
const redirectUrl = url.searchParams.get('redirectUrl');
|
|
65
|
-
if (redirectUrl) {
|
|
66
|
-
res.statusCode = 302;
|
|
67
|
-
res.setHeader('Location', redirectUrl);
|
|
68
|
-
return res.end();
|
|
69
|
-
}
|
|
70
|
-
res.writeHead(200, { 'Content-Type': 'text/html' });
|
|
71
|
-
res.end(`Visit https://<salesforce-url>?aura.mode=devpreview`);
|
|
72
|
-
}
|
|
73
|
-
//# sourceMappingURL=index.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/connection/index.ts"],"names":[],"mappings":"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"}
|