@modern-js/plugin-devtools 2.35.1 → 2.36.0

package/dist/cli.d.ts

@@ -1,9 +1,5 @@
 import type { AppTools, CliPlugin } from '@modern-js/app-tools';
-import { ClientDefinition, SetupClientOptions } from '@modern-js/devtools-kit';
-import { PartialDeep } from 'type-fest';
-export interface Options extends SetupClientOptions {
-  rpcPath?: string;
-  def?: PartialDeep<ClientDefinition>;
-}
+import { Options } from './config';
+export type { Options };
 export declare const devtoolsPlugin: (options?: Options) => CliPlugin<AppTools>;
 export default devtoolsPlugin;

package/dist/cli.js

@@ -1,78 +1,125 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
   for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  devtoolsPlugin: function() {
-    return devtoolsPlugin;
-  },
-  default: function() {
-    return _default;
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var cli_exports = {};
+__export(cli_exports, {
+  default: () => cli_default,
+  devtoolsPlugin: () => devtoolsPlugin
 });
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _lodash = /* @__PURE__ */ _interop_require_default._(require("@modern-js/utils/lodash"));
-const _devtoolskit = require("@modern-js/devtools-kit");
-const _rpc = require("./rpc");
-const getDefaultOptions = () => ({
-  rpcPath: "/_modern_js/devtools/rpc",
-  def: new _devtoolskit.ClientDefinition()
-});
+module.exports = __toCommonJS(cli_exports);
+var import_http = __toESM(require("http"));
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_serve_static = __toESM(require("serve-static"));
+var import_devtools_kit = require("@modern-js/devtools-kit");
+var import_ufo = require("ufo");
+var import_config = require("./config");
+var import_rpc = require("./rpc");
+var import_socket = require("./utils/socket");
 const devtoolsPlugin = (options) => ({
   name: "@modern-js/plugin-devtools",
   usePlugins: [],
   setup: async (api) => {
-    const opts = _lodash.default.defaultsDeep(_lodash.default.cloneDeep(options), getDefaultOptions());
-    const mountOpts = _lodash.default.pick(opts, [
-      "endpoint",
-      "version",
-      "dataSource"
-    ]);
-    const { hooks, builderPlugin, url } = await (0, _rpc.setupClientConnection)({
+    const port = await (0, import_utils.getPort)(8782, {
+      slient: true
+    });
+    const clientServeDir = import_path.default.resolve(require.resolve("@modern-js/devtools-client/package.json"), "../dist");
+    const serveMiddleware = (0, import_serve_static.default)(clientServeDir);
+    const httpServer = import_http.default.createServer((req, res) => {
+      const usePageNotFound = () => {
+        res.write("404");
+        res.statusCode = 404;
+        res.end();
+      };
+      const useMainRoute = () => {
+        req.url = "/html/main/index.html";
+        serveMiddleware(req, res, usePageNotFound);
+      };
+      serveMiddleware(req, res, useMainRoute);
+    });
+    httpServer.listen(port);
+    const socketServer = new import_socket.SocketServer({
+      server: httpServer,
+      path: "/rpc"
+    });
+    const rpc = await (0, import_rpc.setupClientConnection)({
       api,
-      def: opts.def
+      server: socketServer
     });
     return {
-      prepare: hooks.prepare,
-      modifyFileSystemRoutes: hooks.modifyFileSystemRoutes,
+      prepare: rpc.hooks.prepare,
+      modifyFileSystemRoutes: rpc.hooks.modifyFileSystemRoutes,
       validateSchema() {
         return [
           {
-            target: "tools.devtools",
+            target: "devtools",
             schema: {
               typeof: [
-                "boolean"
+                "boolean",
+                "object"
               ]
             }
           }
         ];
       },
+      beforeRestart() {
+        return new Promise((resolve, reject) => httpServer.close((err) => err ? reject(err) : resolve()));
+      },
       config() {
+        const opts = (0, import_config.resolveOptions)(api, options);
+        opts.def && rpc.setDefinition(opts.def);
+        const mountOpts = {
+          dataSource: `${import_devtools_kit.ROUTE_BASENAME}/rpc`,
+          endpoint: import_devtools_kit.ROUTE_BASENAME,
+          __keep: true
+        };
+        let runtimeEntry = require.resolve("@modern-js/plugin-devtools/runtime");
+        runtimeEntry = (0, import_ufo.withQuery)(runtimeEntry, mountOpts);
         return {
           builderPlugins: [
-            builderPlugin
+            rpc.builderPlugin
           ],
           source: {
             preEntry: [
-              require.resolve("@modern-js/plugin-devtools/runtime")
+              runtimeEntry
             ],
             globalVars: {
-              "process.env.__MODERN_DEVTOOLS_MOUNT_OPTIONS": mountOpts
+              "process.env._MODERN_DEVTOOLS_LOGO_SRC": new import_devtools_kit.ClientDefinition().assets.logo
             }
           },
           tools: {
             devServer: {
               proxy: {
-                [opts.rpcPath]: {
-                  target: url.href,
-                  autoRewrite: true,
+                [import_devtools_kit.ROUTE_BASENAME]: {
+                  target: `http://localhost:${port}`,
+                  pathRewrite: {
+                    [`^${import_devtools_kit.ROUTE_BASENAME}`]: ""
+                  },
                   ws: true
                 }
               }
@@ -83,4 +130,8 @@ const devtoolsPlugin = (options) => ({
     };
   }
 });
-const _default = devtoolsPlugin;
+var cli_default = devtoolsPlugin;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  devtoolsPlugin
+});

package/dist/config.d.ts

@@ -0,0 +1,12 @@
+import { ClientDefinition } from '@modern-js/devtools-kit';
+import { PartialDeep } from 'type-fest';
+import { CliPluginAPI } from './types';
+export interface Options {
+  def?: PartialDeep<ClientDefinition>;
+}
+export declare const getDefaultOptions: () => {
+  def: ClientDefinition;
+};
+export declare const resolveOptions: (api: CliPluginAPI, options?: Options) => Options & {
+  def: ClientDefinition;
+};

package/dist/config.js

@@ -0,0 +1,49 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var config_exports = {};
+__export(config_exports, {
+  getDefaultOptions: () => getDefaultOptions,
+  resolveOptions: () => resolveOptions
+});
+module.exports = __toCommonJS(config_exports);
+var import_devtools_kit = require("@modern-js/devtools-kit");
+var import_lodash = __toESM(require("@modern-js/utils/lodash"));
+const getDefaultOptions = () => ({
+  def: new import_devtools_kit.ClientDefinition()
+});
+const resolveOptions = (api, options = {}) => {
+  const config = api.useConfigContext();
+  const opts = import_lodash.default.defaultsDeep({}, options, config.devtools, getDefaultOptions());
+  return opts;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getDefaultOptions,
+  resolveOptions
+});

package/dist/index.d.ts

@@ -1,3 +1,2 @@
-import { devtoolsPlugin } from './cli';
-export { devtoolsPlugin };
-export default devtoolsPlugin;
+export { devtoolsPlugin, default } from './cli';
+export type { Options } from './cli';

package/dist/index.js

@@ -1,21 +1,39 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
   for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  devtoolsPlugin: function() {
-    return _cli.devtoolsPlugin;
-  },
-  default: function() {
-    return _default;
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var src_exports = {};
+__export(src_exports, {
+  default: () => import_cli.default,
+  devtoolsPlugin: () => import_cli.devtoolsPlugin
+});
+module.exports = __toCommonJS(src_exports);
+var import_cli = __toESM(require("./cli"));
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  devtoolsPlugin
 });
-const _cli = require("./cli");
-const _default = _cli.devtoolsPlugin;

package/dist/rpc/index.d.ts

@@ -1,16 +1,15 @@
-/// <reference types="node" />
-import { URL } from 'url';
 import { type ClientDefinition, type ClientFunctions, type ServerFunctions } from '@modern-js/devtools-kit';
 import type { PartialDeep } from 'type-fest';
 import type { BuilderPlugin } from '@modern-js/builder-shared';
 import { CliPluginAPI, BuilderPluginAPI, InjectedHooks } from '../types';
+import { SocketServer } from '../utils/socket';
 export interface SetupClientConnectionOptions {
   api: CliPluginAPI;
-  def?: PartialDeep<ClientDefinition>;
+  server: SocketServer;
 }
 export declare const setupClientConnection: (options: SetupClientConnectionOptions) => Promise<{
   client: import("birpc").BirpcReturn<ClientFunctions, ServerFunctions>;
   hooks: InjectedHooks;
   builderPlugin: BuilderPlugin<BuilderPluginAPI>;
-  url: URL;
+  setDefinition: (definition: PartialDeep<ClientDefinition>) => void;
 }>;

package/dist/rpc/index.js

@@ -1,29 +1,47 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "setupClientConnection", {
-  enumerable: true,
-  get: function() {
-    return setupClientConnection;
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var rpc_exports = {};
+__export(rpc_exports, {
+  setupClientConnection: () => setupClientConnection
 });
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _url = require("url");
-const _lodash = /* @__PURE__ */ _interop_require_default._(require("@modern-js/utils/lodash"));
-const _devtoolskit = require("@modern-js/devtools-kit");
-const _birpc = require("birpc");
-const _pdefer = /* @__PURE__ */ _interop_require_default._(require("p-defer"));
-const _utils = require("@modern-js/utils");
-const _socket = require("../utils/socket");
-const _module = require("../utils/module");
+module.exports = __toCommonJS(rpc_exports);
+var import_lodash = __toESM(require("@modern-js/utils/lodash"));
+var import_devtools_kit = require("@modern-js/devtools-kit");
+var import_birpc = require("birpc");
+var import_p_defer = __toESM(require("p-defer"));
+var import_module = require("../utils/module");
 const setupClientConnection = async (options) => {
-  const { api, def = {} } = options;
-  const port = await (0, _utils.getPort)(8782);
-  const server = new _socket.SocketServer({
-    port
-  });
-  const url = new _url.URL(`ws://localhost:${port}`);
+  const { api, server } = options;
+  let def = {};
+  const setDefinition = (definition) => {
+    def = definition;
+  };
   const _fileSystemRoutesMap = {};
   let handleMessage = null;
   const onceConnection = new Promise((resolve) => {
@@ -33,21 +51,21 @@ const setupClientConnection = async (options) => {
     });
   });
   const deferred = {
-    prepare: (0, _pdefer.default)(),
+    prepare: (0, import_p_defer.default)(),
     builder: {
-      context: (0, _pdefer.default)(),
+      context: (0, import_p_defer.default)(),
       config: {
-        resolved: (0, _pdefer.default)(),
-        transformed: (0, _pdefer.default)()
+        resolved: (0, import_p_defer.default)(),
+        transformed: (0, import_p_defer.default)()
       }
     },
     bundler: {
       config: {
-        resolved: (0, _pdefer.default)(),
-        transformed: (0, _pdefer.default)()
+        resolved: (0, import_p_defer.default)(),
+        transformed: (0, import_p_defer.default)()
       }
     },
-    compileTimeCost: (0, _pdefer.default)()
+    compileTimeCost: (0, import_p_defer.default)()
   };
   const serverFunctions = {
     async getFrameworkConfig() {
@@ -75,7 +93,7 @@ const setupClientConnection = async (options) => {
       const ctx = {
         ...api.useAppContext()
       };
-      return _lodash.default.omit(ctx, [
+      return import_lodash.default.omit(ctx, [
         "builder",
         "serverInternalPlugins"
       ]);
@@ -118,7 +136,7 @@ const setupClientConnection = async (options) => {
       };
       for (const [name, expr] of Object.entries(resolveExprs)) {
         try {
-          ret[name] = (0, _module.requireModule)(expr).version;
+          ret[name] = (0, import_module.requireModule)(expr).version;
         } catch {
         }
       }
@@ -129,9 +147,9 @@ const setupClientConnection = async (options) => {
     },
     async getClientDefinition() {
       const ret = {
-        name: new _devtoolskit.NameDefinition(),
-        packages: new _devtoolskit.PackageDefinition(),
-        assets: new _devtoolskit.AssetDefinition()
+        name: new import_devtools_kit.NameDefinition(),
+        packages: new import_devtools_kit.PackageDefinition(),
+        assets: new import_devtools_kit.AssetDefinition()
       };
       Object.assign(ret.name, def.name);
       Object.assign(ret.packages, def.packages);
@@ -148,13 +166,13 @@ const setupClientConnection = async (options) => {
     serialize: (v) => JSON.stringify(v),
     deserialize: (v) => JSON.parse(v.toString())
   };
-  const clientConn = (0, _birpc.createBirpc)(serverFunctions, clientRpcOptions);
+  const clientConn = (0, import_birpc.createBirpc)(serverFunctions, clientRpcOptions);
   const hooks = {
     prepare() {
       deferred.prepare.resolve();
     },
     modifyFileSystemRoutes({ entrypoint, routes }) {
-      _fileSystemRoutesMap[entrypoint.entryName] = _lodash.default.cloneDeep(routes);
+      _fileSystemRoutesMap[entrypoint.entryName] = import_lodash.default.cloneDeep(routes);
       return {
         entrypoint,
         routes
@@ -164,22 +182,22 @@ const setupClientConnection = async (options) => {
   const builderPlugin = {
     name: "builder-plugin-devtools",
     setup(api2) {
-      deferred.builder.context.resolve(_lodash.default.cloneDeep(api2.context));
+      deferred.builder.context.resolve(import_lodash.default.cloneDeep(api2.context));
       api2.modifyBundlerChain(() => {
-        deferred.builder.config.resolved.resolve(_lodash.default.cloneDeep(api2.getBuilderConfig()));
-        deferred.builder.config.transformed.resolve(_lodash.default.cloneDeep(api2.getNormalizedConfig()));
+        deferred.builder.config.resolved.resolve(import_lodash.default.cloneDeep(api2.getBuilderConfig()));
+        deferred.builder.config.transformed.resolve(import_lodash.default.cloneDeep(api2.getNormalizedConfig()));
       });
       const modifyBundlerConfig = "modifyWebpackConfig" in api2 ? api2.modifyWebpackConfig : api2.modifyRspackConfig;
-      const expectBundlerNum = _lodash.default.castArray(api2.context.target).length;
+      const expectBundlerNum = import_lodash.default.castArray(api2.context.target).length;
       const bundlerConfigs = [];
       modifyBundlerConfig((config) => {
         bundlerConfigs.push(config);
         if (bundlerConfigs.length >= expectBundlerNum) {
-          deferred.bundler.config.resolved.resolve(_lodash.default.cloneDeep(bundlerConfigs));
+          deferred.bundler.config.resolved.resolve(import_lodash.default.cloneDeep(bundlerConfigs));
         }
       });
       api2.onBeforeCreateCompiler(({ bundlerConfigs: bundlerConfigs2 }) => {
-        deferred.bundler.config.transformed.resolve(_lodash.default.cloneDeep(bundlerConfigs2));
+        deferred.bundler.config.transformed.resolve(import_lodash.default.cloneDeep(bundlerConfigs2));
       });
       let buildStartedAt = NaN;
       api2.onAfterCreateCompiler(() => {
@@ -197,6 +215,10 @@ const setupClientConnection = async (options) => {
     client: clientConn,
     hooks,
     builderPlugin,
-    url
+    setDefinition
   };
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  setupClientConnection
+});

package/dist/runtime.js

@@ -1,7 +1,5 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-const _devtoolsmount = require("@modern-js/devtools-mount");
-const opts = process.env.__MODERN_DEVTOOLS_MOUNT_OPTIONS;
-(0, _devtoolsmount.mountDevTools)(opts);
+var import_devtools_mount = require("@modern-js/devtools-mount");
+var import_ufo = require("ufo");
+const opts = (0, import_ufo.parseQuery)(__resourceQuery);
+(0, import_devtools_mount.mountDevTools)(opts);

package/dist/types.js

@@ -1,4 +1,16 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/dist/utils/module.js

@@ -1,29 +1,41 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
   for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  getRequire: function() {
-    return getRequire;
-  },
-  resolveModule: function() {
-    return resolveModule;
-  },
-  requireModule: function() {
-    return requireModule;
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var module_exports = {};
+__export(module_exports, {
+  getRequire: () => getRequire,
+  requireModule: () => requireModule,
+  resolveModule: () => resolveModule
 });
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _assert = /* @__PURE__ */ _interop_require_default._(require("assert"));
-const _module = /* @__PURE__ */ _interop_require_default._(require("module"));
-const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
+module.exports = __toCommonJS(module_exports);
+var import_assert = __toESM(require("assert"));
+var import_module = __toESM(require("module"));
+var import_path = __toESM(require("path"));
 const getRequire = () => {
   var _stack_split__match, _stack;
   try {
@@ -32,10 +44,10 @@ const getRequire = () => {
   }
   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];
   console.log("issuer: ", issuer);
-  if (issuer && _path.default.isAbsolute(issuer)) {
-    return _module.default.createRequire(issuer);
+  if (issuer && import_path.default.isAbsolute(issuer)) {
+    return import_module.default.createRequire(issuer);
   } else {
-    return _module.default.createRequire(process.cwd());
+    return import_module.default.createRequire(process.cwd());
   }
 };
 const resolveModule = (id) => {
@@ -45,7 +57,7 @@ const resolveModule = (id) => {
   const _require = getRequire();
   let resolved = process.cwd();
   for (const id2 of exprs) {
-    if (_path.default.isAbsolute(id2)) {
+    if (import_path.default.isAbsolute(id2)) {
       resolved = id2;
       continue;
     }
@@ -63,10 +75,10 @@ const resolveModule = (id) => {
           resolved,
           pkgName
         ]);
-        (0, _assert.default)(resolvedMain);
+        (0, import_assert.default)(resolvedMain);
         const resolveDir = `${resolvedMain.slice(0, resolvedMain.lastIndexOf(`/node_modules/${pkgName}`) + 1)}/node_modules/${pkgName}`;
         const subpath = expr.replace(pkgName, ".");
-        return resolveModule(_path.default.resolve(resolveDir, subpath));
+        return resolveModule(import_path.default.resolve(resolveDir, subpath));
       }
       const stackText = JSON.stringify(exprs, null, 2);
       const err = new Error(`Failed to resolve "${id2}" from "${resolved}": ${stackText}`);
@@ -84,3 +96,9 @@ const requireModule = (id) => {
   const _require = getRequire();
   return _require(resolved);
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getRequire,
+  requireModule,
+  resolveModule
+});

package/dist/utils/socket.js

@@ -1,16 +1,38 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "SocketServer", {
-  enumerable: true,
-  get: function() {
-    return SocketServer;
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var socket_exports = {};
+__export(socket_exports, {
+  SocketServer: () => SocketServer
 });
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _ws = /* @__PURE__ */ _interop_require_default._(require("ws"));
-class SocketServer extends _ws.default.Server {
+module.exports = __toCommonJS(socket_exports);
+var import_ws = __toESM(require("ws"));
+class SocketServer extends import_ws.default.Server {
   handleHeartbeat(timeout = 3e4) {
     const aliveMapping = /* @__PURE__ */ new WeakMap();
     function heartbeat() {
@@ -39,10 +61,14 @@ class SocketServer extends _ws.default.Server {
   broadcast(data, optsOrCb, cbOrNone) {
     const opts = typeof optsOrCb === "function" ? {} : optsOrCb;
     const cb = typeof optsOrCb === "function" ? optsOrCb : cbOrNone;
-    this.clients.forEach((client) => client.readyState === _ws.default.OPEN && client.send(data, opts !== null && opts !== void 0 ? opts : {}, cb));
+    this.clients.forEach((client) => client.readyState === import_ws.default.OPEN && client.send(data, opts !== null && opts !== void 0 ? opts : {}, cb));
   }
   constructor(options, callback) {
     super(options, callback);
     this.handleHeartbeat();
   }
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  SocketServer
+});

package/package.json

@@ -15,10 +15,10 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.35.1",
+  "version": "2.36.0",
   "jsnext:source": "./src/index.ts",
-  "types": "./dist/types/index.d.ts",
-  "main": "./dist/cjs/index.js",
+  "types": "./dist/index.d.ts",
+  "main": "./dist/index.js",
   "exports": {
     ".": {
       "node": {
@@ -38,31 +38,35 @@
   },
   "dependencies": {
     "birpc": "0.2.13",
+    "serve-static": "^1.14.1",
     "p-defer": "^3.0.0",
     "ws": "8.13.0",
-    "@modern-js/devtools-kit": "2.35.1",
-    "@modern-js/devtools-mount": "2.35.1",
-    "@modern-js/utils": "2.35.1"
+    "ufo": "^1.3.0",
+    "@modern-js/devtools-kit": "2.36.0",
+    "@modern-js/devtools-mount": "2.36.0",
+    "@modern-js/devtools-client": "2.36.0",
+    "@modern-js/utils": "2.36.0"
   },
   "devDependencies": {
+    "@types/serve-static": "^1.13.10",
     "@swc/helpers": "0.5.1",
     "@types/node": "^14",
     "@types/ws": "^8.5.5",
     "type-fest": "^4.1.0",
     "typescript": "^5",
-    "@modern-js/app-tools": "2.35.1",
-    "@modern-js/core": "2.35.1",
-    "@modern-js/module-tools": "2.35.1",
-    "@modern-js/runtime": "2.35.1",
-    "@modern-js/server-core": "2.35.1",
-    "@modern-js/types": "2.35.1",
-    "@modern-js/builder-webpack-provider": "2.35.1",
-    "@modern-js/builder-rspack-provider": "2.35.1",
-    "@modern-js/builder-shared": "2.35.1",
-    "@scripts/build": "2.35.1"
+    "@modern-js/app-tools": "2.36.0",
+    "@modern-js/core": "2.36.0",
+    "@modern-js/module-tools": "2.36.0",
+    "@modern-js/runtime": "2.36.0",
+    "@modern-js/server-core": "2.36.0",
+    "@modern-js/types": "2.36.0",
+    "@modern-js/builder-webpack-provider": "2.36.0",
+    "@modern-js/builder-rspack-provider": "2.36.0",
+    "@modern-js/builder-shared": "2.36.0",
+    "@scripts/build": "2.36.0"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "^2.35.1"
+    "@modern-js/runtime": "^2.36.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {