@modern-js/plugin-devtools 0.0.0-next-20230921083429 → 0.0.0-next-20230922063312
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/cli.js +53 -35
- package/dist/config.js +39 -20
- package/dist/index.js +35 -17
- package/dist/rpc/index.js +63 -34
- package/dist/runtime.js +4 -7
- package/dist/types.js +15 -3
- package/dist/utils/module.js +46 -28
- package/dist/utils/socket.js +37 -11
- package/package.json +16 -16
package/dist/cli.js
CHANGED
|
@@ -1,42 +1,56 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
var __create = Object.create;
|
|
3
|
+
var __defProp = Object.defineProperty;
|
|
4
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
7
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
8
|
+
var __export = (target, all) => {
|
|
6
9
|
for (var name in all)
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
return devtoolsPlugin;
|
|
15
|
-
},
|
|
16
|
-
default: function() {
|
|
17
|
-
return _default;
|
|
10
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
11
|
+
};
|
|
12
|
+
var __copyProps = (to, from, except, desc) => {
|
|
13
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
14
|
+
for (let key of __getOwnPropNames(from))
|
|
15
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
16
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
18
17
|
}
|
|
18
|
+
return to;
|
|
19
|
+
};
|
|
20
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
21
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
22
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
23
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
24
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
25
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
26
|
+
mod
|
|
27
|
+
));
|
|
28
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
29
|
+
var cli_exports = {};
|
|
30
|
+
__export(cli_exports, {
|
|
31
|
+
default: () => cli_default,
|
|
32
|
+
devtoolsPlugin: () => devtoolsPlugin
|
|
19
33
|
});
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
34
|
+
module.exports = __toCommonJS(cli_exports);
|
|
35
|
+
var import_http = __toESM(require("http"));
|
|
36
|
+
var import_path = __toESM(require("path"));
|
|
37
|
+
var import_utils = require("@modern-js/utils");
|
|
38
|
+
var import_serve_static = __toESM(require("serve-static"));
|
|
39
|
+
var import_devtools_kit = require("@modern-js/devtools-kit");
|
|
40
|
+
var import_ufo = require("ufo");
|
|
41
|
+
var import_config = require("./config");
|
|
42
|
+
var import_rpc = require("./rpc");
|
|
43
|
+
var import_socket = require("./utils/socket");
|
|
30
44
|
const devtoolsPlugin = (options) => ({
|
|
31
45
|
name: "@modern-js/plugin-devtools",
|
|
32
46
|
usePlugins: [],
|
|
33
47
|
setup: async (api) => {
|
|
34
|
-
const port = await (0,
|
|
48
|
+
const port = await (0, import_utils.getPort)(8782, {
|
|
35
49
|
slient: true
|
|
36
50
|
});
|
|
37
|
-
const clientServeDir =
|
|
38
|
-
const serveMiddleware = (0,
|
|
39
|
-
const httpServer =
|
|
51
|
+
const clientServeDir = import_path.default.resolve(require.resolve("@modern-js/devtools-client/package.json"), "../dist");
|
|
52
|
+
const serveMiddleware = (0, import_serve_static.default)(clientServeDir);
|
|
53
|
+
const httpServer = import_http.default.createServer((req, res) => {
|
|
40
54
|
const usePageNotFound = () => {
|
|
41
55
|
res.write("404");
|
|
42
56
|
res.statusCode = 404;
|
|
@@ -49,11 +63,11 @@ const devtoolsPlugin = (options) => ({
|
|
|
49
63
|
serveMiddleware(req, res, useMainRoute);
|
|
50
64
|
});
|
|
51
65
|
httpServer.listen(port);
|
|
52
|
-
const socketServer = new
|
|
66
|
+
const socketServer = new import_socket.SocketServer({
|
|
53
67
|
server: httpServer,
|
|
54
68
|
path: "/rpc"
|
|
55
69
|
});
|
|
56
|
-
const rpc = await (0,
|
|
70
|
+
const rpc = await (0, import_rpc.setupClientConnection)({
|
|
57
71
|
api,
|
|
58
72
|
server: socketServer
|
|
59
73
|
});
|
|
@@ -77,7 +91,7 @@ const devtoolsPlugin = (options) => ({
|
|
|
77
91
|
return new Promise((resolve, reject) => httpServer.close((err) => err ? reject(err) : resolve()));
|
|
78
92
|
},
|
|
79
93
|
config() {
|
|
80
|
-
const opts = (0,
|
|
94
|
+
const opts = (0, import_config.resolveOptions)(api, options);
|
|
81
95
|
opts.def && rpc.setDefinition(opts.def);
|
|
82
96
|
const mountOpts = {
|
|
83
97
|
dataSource: `/_modern_js/devtools/rpc`,
|
|
@@ -85,7 +99,7 @@ const devtoolsPlugin = (options) => ({
|
|
|
85
99
|
__keep: true
|
|
86
100
|
};
|
|
87
101
|
let runtimeEntry = require.resolve("@modern-js/plugin-devtools/runtime");
|
|
88
|
-
runtimeEntry = (0,
|
|
102
|
+
runtimeEntry = (0, import_ufo.withQuery)(runtimeEntry, mountOpts);
|
|
89
103
|
return {
|
|
90
104
|
builderPlugins: [
|
|
91
105
|
rpc.builderPlugin
|
|
@@ -95,7 +109,7 @@ const devtoolsPlugin = (options) => ({
|
|
|
95
109
|
runtimeEntry
|
|
96
110
|
],
|
|
97
111
|
globalVars: {
|
|
98
|
-
"process.env._MODERN_DEVTOOLS_LOGO_SRC": new
|
|
112
|
+
"process.env._MODERN_DEVTOOLS_LOGO_SRC": new import_devtools_kit.ClientDefinition().assets.logo
|
|
99
113
|
}
|
|
100
114
|
},
|
|
101
115
|
tools: {
|
|
@@ -116,4 +130,8 @@ const devtoolsPlugin = (options) => ({
|
|
|
116
130
|
};
|
|
117
131
|
}
|
|
118
132
|
});
|
|
119
|
-
|
|
133
|
+
var cli_default = devtoolsPlugin;
|
|
134
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
135
|
+
0 && (module.exports = {
|
|
136
|
+
devtoolsPlugin
|
|
137
|
+
});
|
package/dist/config.js
CHANGED
|
@@ -1,31 +1,50 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
var __create = Object.create;
|
|
3
|
+
var __defProp = Object.defineProperty;
|
|
4
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
7
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
8
|
+
var __export = (target, all) => {
|
|
6
9
|
for (var name in all)
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
return getDefaultOptions;
|
|
15
|
-
},
|
|
16
|
-
resolveOptions: function() {
|
|
17
|
-
return resolveOptions;
|
|
10
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
11
|
+
};
|
|
12
|
+
var __copyProps = (to, from, except, desc) => {
|
|
13
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
14
|
+
for (let key of __getOwnPropNames(from))
|
|
15
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
16
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
18
17
|
}
|
|
18
|
+
return to;
|
|
19
|
+
};
|
|
20
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
21
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
22
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
23
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
24
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
25
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
26
|
+
mod
|
|
27
|
+
));
|
|
28
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
29
|
+
var config_exports = {};
|
|
30
|
+
__export(config_exports, {
|
|
31
|
+
getDefaultOptions: () => getDefaultOptions,
|
|
32
|
+
resolveOptions: () => resolveOptions
|
|
19
33
|
});
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
34
|
+
module.exports = __toCommonJS(config_exports);
|
|
35
|
+
var import_devtools_kit = require("@modern-js/devtools-kit");
|
|
36
|
+
var import_lodash = __toESM(require("@modern-js/utils/lodash"));
|
|
23
37
|
const getDefaultOptions = () => ({
|
|
24
38
|
// prefix: '/_modern_js/devtools',
|
|
25
|
-
def: new
|
|
39
|
+
def: new import_devtools_kit.ClientDefinition()
|
|
26
40
|
});
|
|
27
41
|
const resolveOptions = (api, options = {}) => {
|
|
28
42
|
const config = api.useConfigContext();
|
|
29
|
-
const opts =
|
|
43
|
+
const opts = import_lodash.default.defaultsDeep({}, options, config.devtools, getDefaultOptions());
|
|
30
44
|
return opts;
|
|
31
45
|
};
|
|
46
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
47
|
+
0 && (module.exports = {
|
|
48
|
+
getDefaultOptions,
|
|
49
|
+
resolveOptions
|
|
50
|
+
});
|
package/dist/index.js
CHANGED
|
@@ -1,21 +1,39 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
var __create = Object.create;
|
|
3
|
+
var __defProp = Object.defineProperty;
|
|
4
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
7
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
8
|
+
var __export = (target, all) => {
|
|
6
9
|
for (var name in all)
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
return _cli.devtoolsPlugin;
|
|
15
|
-
},
|
|
16
|
-
default: function() {
|
|
17
|
-
return _cli.default;
|
|
10
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
11
|
+
};
|
|
12
|
+
var __copyProps = (to, from, except, desc) => {
|
|
13
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
14
|
+
for (let key of __getOwnPropNames(from))
|
|
15
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
16
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
18
17
|
}
|
|
18
|
+
return to;
|
|
19
|
+
};
|
|
20
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
21
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
22
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
23
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
24
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
25
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
26
|
+
mod
|
|
27
|
+
));
|
|
28
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
29
|
+
var src_exports = {};
|
|
30
|
+
__export(src_exports, {
|
|
31
|
+
default: () => import_cli.default,
|
|
32
|
+
devtoolsPlugin: () => import_cli.devtoolsPlugin
|
|
33
|
+
});
|
|
34
|
+
module.exports = __toCommonJS(src_exports);
|
|
35
|
+
var import_cli = __toESM(require("./cli"));
|
|
36
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
37
|
+
0 && (module.exports = {
|
|
38
|
+
devtoolsPlugin
|
|
19
39
|
});
|
|
20
|
-
const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
|
|
21
|
-
const _cli = /* @__PURE__ */ _interop_require_wildcard._(require("./cli"));
|
package/dist/rpc/index.js
CHANGED
|
@@ -1,19 +1,41 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
2
|
+
var __create = Object.create;
|
|
3
|
+
var __defProp = Object.defineProperty;
|
|
4
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
7
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
8
|
+
var __export = (target, all) => {
|
|
9
|
+
for (var name in all)
|
|
10
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
11
|
+
};
|
|
12
|
+
var __copyProps = (to, from, except, desc) => {
|
|
13
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
14
|
+
for (let key of __getOwnPropNames(from))
|
|
15
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
16
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
9
17
|
}
|
|
18
|
+
return to;
|
|
19
|
+
};
|
|
20
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
21
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
22
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
23
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
24
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
25
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
26
|
+
mod
|
|
27
|
+
));
|
|
28
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
29
|
+
var rpc_exports = {};
|
|
30
|
+
__export(rpc_exports, {
|
|
31
|
+
setupClientConnection: () => setupClientConnection
|
|
10
32
|
});
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
33
|
+
module.exports = __toCommonJS(rpc_exports);
|
|
34
|
+
var import_lodash = __toESM(require("@modern-js/utils/lodash"));
|
|
35
|
+
var import_devtools_kit = require("@modern-js/devtools-kit");
|
|
36
|
+
var import_birpc = require("birpc");
|
|
37
|
+
var import_p_defer = __toESM(require("p-defer"));
|
|
38
|
+
var import_module = require("../utils/module");
|
|
17
39
|
const setupClientConnection = async (options) => {
|
|
18
40
|
const { api, server } = options;
|
|
19
41
|
let def = {};
|
|
@@ -25,25 +47,28 @@ const setupClientConnection = async (options) => {
|
|
|
25
47
|
const onceConnection = new Promise((resolve) => {
|
|
26
48
|
server.on("connection", (ws) => {
|
|
27
49
|
resolve();
|
|
28
|
-
ws.on("message", (data, isBinary) =>
|
|
50
|
+
ws.on("message", (data, isBinary) => {
|
|
51
|
+
var _handleMessage;
|
|
52
|
+
return (_handleMessage = handleMessage) === null || _handleMessage === void 0 ? void 0 : _handleMessage(data, isBinary);
|
|
53
|
+
});
|
|
29
54
|
});
|
|
30
55
|
});
|
|
31
56
|
const deferred = {
|
|
32
|
-
prepare: (0,
|
|
57
|
+
prepare: (0, import_p_defer.default)(),
|
|
33
58
|
builder: {
|
|
34
|
-
context: (0,
|
|
59
|
+
context: (0, import_p_defer.default)(),
|
|
35
60
|
config: {
|
|
36
|
-
resolved: (0,
|
|
37
|
-
transformed: (0,
|
|
61
|
+
resolved: (0, import_p_defer.default)(),
|
|
62
|
+
transformed: (0, import_p_defer.default)()
|
|
38
63
|
}
|
|
39
64
|
},
|
|
40
65
|
bundler: {
|
|
41
66
|
config: {
|
|
42
|
-
resolved: (0,
|
|
43
|
-
transformed: (0,
|
|
67
|
+
resolved: (0, import_p_defer.default)(),
|
|
68
|
+
transformed: (0, import_p_defer.default)()
|
|
44
69
|
}
|
|
45
70
|
},
|
|
46
|
-
compileTimeCost: (0,
|
|
71
|
+
compileTimeCost: (0, import_p_defer.default)()
|
|
47
72
|
};
|
|
48
73
|
const serverFunctions = {
|
|
49
74
|
async getFrameworkConfig() {
|
|
@@ -71,7 +96,7 @@ const setupClientConnection = async (options) => {
|
|
|
71
96
|
const ctx = {
|
|
72
97
|
...api.useAppContext()
|
|
73
98
|
};
|
|
74
|
-
return
|
|
99
|
+
return import_lodash.default.omit(ctx, [
|
|
75
100
|
"builder",
|
|
76
101
|
"serverInternalPlugins"
|
|
77
102
|
]);
|
|
@@ -114,7 +139,7 @@ const setupClientConnection = async (options) => {
|
|
|
114
139
|
};
|
|
115
140
|
for (const [name, expr] of Object.entries(resolveExprs)) {
|
|
116
141
|
try {
|
|
117
|
-
ret[name] = (0,
|
|
142
|
+
ret[name] = (0, import_module.requireModule)(expr).version;
|
|
118
143
|
} catch {
|
|
119
144
|
}
|
|
120
145
|
}
|
|
@@ -125,9 +150,9 @@ const setupClientConnection = async (options) => {
|
|
|
125
150
|
},
|
|
126
151
|
async getClientDefinition() {
|
|
127
152
|
const ret = {
|
|
128
|
-
name: new
|
|
129
|
-
packages: new
|
|
130
|
-
assets: new
|
|
153
|
+
name: new import_devtools_kit.NameDefinition(),
|
|
154
|
+
packages: new import_devtools_kit.PackageDefinition(),
|
|
155
|
+
assets: new import_devtools_kit.AssetDefinition()
|
|
131
156
|
};
|
|
132
157
|
Object.assign(ret.name, def.name);
|
|
133
158
|
Object.assign(ret.packages, def.packages);
|
|
@@ -144,13 +169,13 @@ const setupClientConnection = async (options) => {
|
|
|
144
169
|
serialize: (v) => JSON.stringify(v),
|
|
145
170
|
deserialize: (v) => JSON.parse(v.toString())
|
|
146
171
|
};
|
|
147
|
-
const clientConn = (0,
|
|
172
|
+
const clientConn = (0, import_birpc.createBirpc)(serverFunctions, clientRpcOptions);
|
|
148
173
|
const hooks = {
|
|
149
174
|
prepare() {
|
|
150
175
|
deferred.prepare.resolve();
|
|
151
176
|
},
|
|
152
177
|
modifyFileSystemRoutes({ entrypoint, routes }) {
|
|
153
|
-
_fileSystemRoutesMap[entrypoint.entryName] =
|
|
178
|
+
_fileSystemRoutesMap[entrypoint.entryName] = import_lodash.default.cloneDeep(routes);
|
|
154
179
|
return {
|
|
155
180
|
entrypoint,
|
|
156
181
|
routes
|
|
@@ -160,22 +185,22 @@ const setupClientConnection = async (options) => {
|
|
|
160
185
|
const builderPlugin = {
|
|
161
186
|
name: "builder-plugin-devtools",
|
|
162
187
|
setup(api2) {
|
|
163
|
-
deferred.builder.context.resolve(
|
|
188
|
+
deferred.builder.context.resolve(import_lodash.default.cloneDeep(api2.context));
|
|
164
189
|
api2.modifyBundlerChain(() => {
|
|
165
|
-
deferred.builder.config.resolved.resolve(
|
|
166
|
-
deferred.builder.config.transformed.resolve(
|
|
190
|
+
deferred.builder.config.resolved.resolve(import_lodash.default.cloneDeep(api2.getBuilderConfig()));
|
|
191
|
+
deferred.builder.config.transformed.resolve(import_lodash.default.cloneDeep(api2.getNormalizedConfig()));
|
|
167
192
|
});
|
|
168
193
|
const modifyBundlerConfig = "modifyWebpackConfig" in api2 ? api2.modifyWebpackConfig : api2.modifyRspackConfig;
|
|
169
|
-
const expectBundlerNum =
|
|
194
|
+
const expectBundlerNum = import_lodash.default.castArray(api2.context.target).length;
|
|
170
195
|
const bundlerConfigs = [];
|
|
171
196
|
modifyBundlerConfig((config) => {
|
|
172
197
|
bundlerConfigs.push(config);
|
|
173
198
|
if (bundlerConfigs.length >= expectBundlerNum) {
|
|
174
|
-
deferred.bundler.config.resolved.resolve(
|
|
199
|
+
deferred.bundler.config.resolved.resolve(import_lodash.default.cloneDeep(bundlerConfigs));
|
|
175
200
|
}
|
|
176
201
|
});
|
|
177
202
|
api2.onBeforeCreateCompiler(({ bundlerConfigs: bundlerConfigs2 }) => {
|
|
178
|
-
deferred.bundler.config.transformed.resolve(
|
|
203
|
+
deferred.bundler.config.transformed.resolve(import_lodash.default.cloneDeep(bundlerConfigs2));
|
|
179
204
|
});
|
|
180
205
|
let buildStartedAt = NaN;
|
|
181
206
|
api2.onAfterCreateCompiler(() => {
|
|
@@ -196,3 +221,7 @@ const setupClientConnection = async (options) => {
|
|
|
196
221
|
setDefinition
|
|
197
222
|
};
|
|
198
223
|
};
|
|
224
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
225
|
+
0 && (module.exports = {
|
|
226
|
+
setupClientConnection
|
|
227
|
+
});
|
package/dist/runtime.js
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const _ufo = require("ufo");
|
|
7
|
-
const opts = (0, _ufo.parseQuery)(__resourceQuery);
|
|
8
|
-
(0, _devtoolsmount.mountDevTools)(opts);
|
|
2
|
+
var import_devtools_mount = require("@modern-js/devtools-mount");
|
|
3
|
+
var import_ufo = require("ufo");
|
|
4
|
+
const opts = (0, import_ufo.parseQuery)(__resourceQuery);
|
|
5
|
+
(0, import_devtools_mount.mountDevTools)(opts);
|
package/dist/types.js
CHANGED
|
@@ -1,4 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty
|
|
3
|
-
|
|
4
|
-
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __copyProps = (to, from, except, desc) => {
|
|
7
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
8
|
+
for (let key of __getOwnPropNames(from))
|
|
9
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
10
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
11
|
+
}
|
|
12
|
+
return to;
|
|
13
|
+
};
|
|
14
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
15
|
+
var types_exports = {};
|
|
16
|
+
module.exports = __toCommonJS(types_exports);
|
package/dist/utils/module.js
CHANGED
|
@@ -1,29 +1,41 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
var __create = Object.create;
|
|
3
|
+
var __defProp = Object.defineProperty;
|
|
4
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
7
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
8
|
+
var __export = (target, all) => {
|
|
6
9
|
for (var name in all)
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
return getRequire;
|
|
15
|
-
},
|
|
16
|
-
resolveModule: function() {
|
|
17
|
-
return resolveModule;
|
|
18
|
-
},
|
|
19
|
-
requireModule: function() {
|
|
20
|
-
return requireModule;
|
|
10
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
11
|
+
};
|
|
12
|
+
var __copyProps = (to, from, except, desc) => {
|
|
13
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
14
|
+
for (let key of __getOwnPropNames(from))
|
|
15
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
16
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
21
17
|
}
|
|
18
|
+
return to;
|
|
19
|
+
};
|
|
20
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
21
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
22
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
23
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
24
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
25
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
26
|
+
mod
|
|
27
|
+
));
|
|
28
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
29
|
+
var module_exports = {};
|
|
30
|
+
__export(module_exports, {
|
|
31
|
+
getRequire: () => getRequire,
|
|
32
|
+
requireModule: () => requireModule,
|
|
33
|
+
resolveModule: () => resolveModule
|
|
22
34
|
});
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
35
|
+
module.exports = __toCommonJS(module_exports);
|
|
36
|
+
var import_assert = __toESM(require("assert"));
|
|
37
|
+
var import_module = __toESM(require("module"));
|
|
38
|
+
var import_path = __toESM(require("path"));
|
|
27
39
|
const getRequire = () => {
|
|
28
40
|
var _stack_split__match, _stack;
|
|
29
41
|
try {
|
|
@@ -32,10 +44,10 @@ const getRequire = () => {
|
|
|
32
44
|
}
|
|
33
45
|
const issuer = (_stack = new Error().stack) === null || _stack === void 0 ? void 0 : (_stack_split__match = _stack.split("\n")[2].match(/\s*at .+? \((.*)\)$/)) === null || _stack_split__match === void 0 ? void 0 : _stack_split__match[1];
|
|
34
46
|
console.log("issuer: ", issuer);
|
|
35
|
-
if (issuer &&
|
|
36
|
-
return
|
|
47
|
+
if (issuer && import_path.default.isAbsolute(issuer)) {
|
|
48
|
+
return import_module.default.createRequire(issuer);
|
|
37
49
|
} else {
|
|
38
|
-
return
|
|
50
|
+
return import_module.default.createRequire(process.cwd());
|
|
39
51
|
}
|
|
40
52
|
};
|
|
41
53
|
const resolveModule = (id) => {
|
|
@@ -45,7 +57,7 @@ const resolveModule = (id) => {
|
|
|
45
57
|
const _require = getRequire();
|
|
46
58
|
let resolved = process.cwd();
|
|
47
59
|
for (const id2 of exprs) {
|
|
48
|
-
if (
|
|
60
|
+
if (import_path.default.isAbsolute(id2)) {
|
|
49
61
|
resolved = id2;
|
|
50
62
|
continue;
|
|
51
63
|
}
|
|
@@ -63,10 +75,10 @@ const resolveModule = (id) => {
|
|
|
63
75
|
resolved,
|
|
64
76
|
pkgName
|
|
65
77
|
]);
|
|
66
|
-
(0,
|
|
78
|
+
(0, import_assert.default)(resolvedMain);
|
|
67
79
|
const resolveDir = `${resolvedMain.slice(0, resolvedMain.lastIndexOf(`/node_modules/${pkgName}`) + 1)}/node_modules/${pkgName}`;
|
|
68
80
|
const subpath = expr.replace(pkgName, ".");
|
|
69
|
-
return resolveModule(
|
|
81
|
+
return resolveModule(import_path.default.resolve(resolveDir, subpath));
|
|
70
82
|
}
|
|
71
83
|
const stackText = JSON.stringify(exprs, null, 2);
|
|
72
84
|
const err = new Error(`Failed to resolve "${id2}" from "${resolved}": ${stackText}`);
|
|
@@ -84,3 +96,9 @@ const requireModule = (id) => {
|
|
|
84
96
|
const _require = getRequire();
|
|
85
97
|
return _require(resolved);
|
|
86
98
|
};
|
|
99
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
100
|
+
0 && (module.exports = {
|
|
101
|
+
getRequire,
|
|
102
|
+
requireModule,
|
|
103
|
+
resolveModule
|
|
104
|
+
});
|
package/dist/utils/socket.js
CHANGED
|
@@ -1,16 +1,38 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
2
|
+
var __create = Object.create;
|
|
3
|
+
var __defProp = Object.defineProperty;
|
|
4
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
7
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
8
|
+
var __export = (target, all) => {
|
|
9
|
+
for (var name in all)
|
|
10
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
11
|
+
};
|
|
12
|
+
var __copyProps = (to, from, except, desc) => {
|
|
13
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
14
|
+
for (let key of __getOwnPropNames(from))
|
|
15
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
16
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
9
17
|
}
|
|
18
|
+
return to;
|
|
19
|
+
};
|
|
20
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
21
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
22
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
23
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
24
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
25
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
26
|
+
mod
|
|
27
|
+
));
|
|
28
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
29
|
+
var socket_exports = {};
|
|
30
|
+
__export(socket_exports, {
|
|
31
|
+
SocketServer: () => SocketServer
|
|
10
32
|
});
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
class SocketServer extends
|
|
33
|
+
module.exports = __toCommonJS(socket_exports);
|
|
34
|
+
var import_ws = __toESM(require("ws"));
|
|
35
|
+
class SocketServer extends import_ws.default.Server {
|
|
14
36
|
handleHeartbeat(timeout = 3e4) {
|
|
15
37
|
const aliveMapping = /* @__PURE__ */ new WeakMap();
|
|
16
38
|
function heartbeat() {
|
|
@@ -39,10 +61,14 @@ class SocketServer extends _ws.default.Server {
|
|
|
39
61
|
broadcast(data, optsOrCb, cbOrNone) {
|
|
40
62
|
const opts = typeof optsOrCb === "function" ? {} : optsOrCb;
|
|
41
63
|
const cb = typeof optsOrCb === "function" ? optsOrCb : cbOrNone;
|
|
42
|
-
this.clients.forEach((client) => client.readyState ===
|
|
64
|
+
this.clients.forEach((client) => client.readyState === import_ws.default.OPEN && client.send(data, opts !== null && opts !== void 0 ? opts : {}, cb));
|
|
43
65
|
}
|
|
44
66
|
constructor(options, callback) {
|
|
45
67
|
super(options, callback);
|
|
46
68
|
this.handleHeartbeat();
|
|
47
69
|
}
|
|
48
70
|
}
|
|
71
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
72
|
+
0 && (module.exports = {
|
|
73
|
+
SocketServer
|
|
74
|
+
});
|
package/package.json
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"modern",
|
|
16
16
|
"modern.js"
|
|
17
17
|
],
|
|
18
|
-
"version": "0.0.0-next-
|
|
18
|
+
"version": "0.0.0-next-20230922063312",
|
|
19
19
|
"jsnext:source": "./src/index.ts",
|
|
20
20
|
"types": "./dist/types/index.d.ts",
|
|
21
21
|
"main": "./dist/index.js",
|
|
@@ -42,10 +42,10 @@
|
|
|
42
42
|
"p-defer": "^3.0.0",
|
|
43
43
|
"ws": "8.13.0",
|
|
44
44
|
"ufo": "^1.3.0",
|
|
45
|
-
"@modern-js/devtools-kit": "0.0.0-next-
|
|
46
|
-
"@modern-js/devtools-mount": "0.0.0-next-
|
|
47
|
-
"@modern-js/devtools-client": "0.0.0-next-
|
|
48
|
-
"@modern-js/utils": "0.0.0-next-
|
|
45
|
+
"@modern-js/devtools-kit": "0.0.0-next-20230922063312",
|
|
46
|
+
"@modern-js/devtools-mount": "0.0.0-next-20230922063312",
|
|
47
|
+
"@modern-js/devtools-client": "0.0.0-next-20230922063312",
|
|
48
|
+
"@modern-js/utils": "0.0.0-next-20230922063312"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
51
|
"@types/serve-static": "^1.13.10",
|
|
@@ -54,19 +54,19 @@
|
|
|
54
54
|
"@types/ws": "^8.5.5",
|
|
55
55
|
"type-fest": "^4.1.0",
|
|
56
56
|
"typescript": "^5",
|
|
57
|
-
"@modern-js/app-tools": "0.0.0-next-
|
|
58
|
-
"@modern-js/
|
|
59
|
-
"@modern-js/
|
|
60
|
-
"@modern-js/server-core": "0.0.0-next-
|
|
61
|
-
"@modern-js/types": "0.0.0-next-
|
|
62
|
-
"@modern-js/
|
|
63
|
-
"@modern-js/builder-
|
|
64
|
-
"@modern-js/builder-
|
|
65
|
-
"@
|
|
66
|
-
"@
|
|
57
|
+
"@modern-js/app-tools": "0.0.0-next-20230922063312",
|
|
58
|
+
"@modern-js/module-tools": "0.0.0-next-20230922063312",
|
|
59
|
+
"@modern-js/runtime": "0.0.0-next-20230922063312",
|
|
60
|
+
"@modern-js/server-core": "0.0.0-next-20230922063312",
|
|
61
|
+
"@modern-js/types": "0.0.0-next-20230922063312",
|
|
62
|
+
"@modern-js/builder-webpack-provider": "0.0.0-next-20230922063312",
|
|
63
|
+
"@modern-js/builder-rspack-provider": "0.0.0-next-20230922063312",
|
|
64
|
+
"@modern-js/builder-shared": "0.0.0-next-20230922063312",
|
|
65
|
+
"@scripts/build": "0.0.0-next-20230922063312",
|
|
66
|
+
"@modern-js/core": "0.0.0-next-20230922063312"
|
|
67
67
|
},
|
|
68
68
|
"peerDependencies": {
|
|
69
|
-
"@modern-js/runtime": "0.0.0-next-
|
|
69
|
+
"@modern-js/runtime": "0.0.0-next-20230922063312"
|
|
70
70
|
},
|
|
71
71
|
"peerDependenciesMeta": {
|
|
72
72
|
"@modern-js/runtime": {
|