@modern-js/plugin-devtools 2.39.2 → 2.41.0

package/dist/cli.d.ts

@@ -1,5 +1,5 @@
 import type { AppTools, CliPlugin } from '@modern-js/app-tools';
 import { DevtoolsPluginOptions, DevtoolsPluginInlineOptions } from './config';
 export type { DevtoolsPluginOptions, DevtoolsPluginInlineOptions };
-export declare const devtoolsPlugin: (options?: DevtoolsPluginInlineOptions) => CliPlugin<AppTools>;
+export declare const devtoolsPlugin: (inlineOptions?: DevtoolsPluginInlineOptions) => CliPlugin<AppTools>;
 export default devtoolsPlugin;

package/dist/cli.js

@@ -41,35 +41,17 @@ var import_ufo = require("ufo");
 var import_config = require("./config");
 var import_rpc = require("./rpc");
 var import_socket = require("./utils/socket");
-const devtoolsPlugin = (options) => ({
+const devtoolsPlugin = (inlineOptions = {}) => ({
   name: "@modern-js/plugin-devtools",
   usePlugins: [],
   setup: async (api) => {
-    var _options_enable;
-    const enablePlugin = (_options_enable = options === null || options === void 0 ? void 0 : options.enable) !== null && _options_enable !== void 0 ? _options_enable : process.env.NODE_ENV === "development";
-    if (!enablePlugin) {
+    const ctx = (0, import_config.resolveContext)(inlineOptions);
+    if (!ctx.enable) {
       return {};
     }
-    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 httpServer = await setupHttpServer();
     const socketServer = new import_socket.SocketServer({
-      server: httpServer,
+      server: httpServer.instance,
       path: "/rpc"
     });
     const rpc = await (0, import_rpc.setupClientConnection)({
@@ -79,50 +61,31 @@ const devtoolsPlugin = (options) => ({
     return {
       prepare: rpc.hooks.prepare,
       modifyFileSystemRoutes: rpc.hooks.modifyFileSystemRoutes,
-      validateSchema() {
-        return [
-          {
-            target: "devtools",
-            schema: {
-              typeof: [
-                "boolean",
-                "object"
-              ]
-            }
-          }
-        ];
-      },
       beforeRestart() {
-        return new Promise((resolve, reject) => httpServer.close((err) => err ? reject(err) : resolve()));
+        return new Promise((resolve, reject) => httpServer.instance.close((err) => err ? reject(err) : resolve()));
       },
       config() {
-        const opts = (0, import_config.resolveOptions)(api, options);
-        import_utils.logger.info(`${opts.def.name.formalName} Devtools is enabled`);
-        opts.def && rpc.setDefinition(opts.def);
-        const mountOpts = {
-          dataSource: `${import_devtools_kit.ROUTE_BASENAME}/rpc`,
-          endpoint: import_devtools_kit.ROUTE_BASENAME,
+        var _api_useConfigContext_devtools;
+        const config = (_api_useConfigContext_devtools = api.useConfigContext().devtools) !== null && _api_useConfigContext_devtools !== void 0 ? _api_useConfigContext_devtools : {};
+        Object.assign(ctx, (0, import_config.resolveContext)(ctx, config), {
           __keep: true
-        };
-        let runtimeEntry = require.resolve("@modern-js/plugin-devtools/runtime");
-        runtimeEntry = (0, import_ufo.withQuery)(runtimeEntry, mountOpts);
+        });
+        import_utils.logger.info(`${ctx.def.name.formalName} Devtools is enabled`);
+        const runtimeEntry = require.resolve("@modern-js/devtools-client/mount");
         return {
           builderPlugins: [
             rpc.builderPlugin
           ],
           source: {
             preEntry: [
-              runtimeEntry
-            ],
-            globalVars: {
-              "process.env._MODERN_DEVTOOLS_LOGO_SRC": new import_devtools_kit.ClientDefinition().assets.logo
-            }
+              (0, import_ufo.withQuery)(runtimeEntry, ctx)
+            ]
           },
           tools: {
             devServer: {
               proxy: {
                 [import_devtools_kit.ROUTE_BASENAME]: {
-                  target: `http://localhost:${port}`,
+                  target: `http://localhost:${httpServer.port}`,
                   pathRewrite: {
                     [`^${import_devtools_kit.ROUTE_BASENAME}`]: ""
                   },
@@ -137,6 +100,30 @@ const devtoolsPlugin = (options) => ({
   }
 });
 var cli_default = devtoolsPlugin;
+const setupHttpServer = async () => {
+  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 instance = import_http.default.createServer((req, res) => {
+    const usePageNotFound = () => {
+      res.write("404");
+      res.statusCode = 404;
+      res.end();
+    };
+    const useMainRoute = () => {
+      req.url = "/html/client/index.html";
+      serveMiddleware(req, res, usePageNotFound);
+    };
+    serveMiddleware(req, res, useMainRoute);
+  });
+  instance.listen(port);
+  return {
+    instance,
+    port
+  };
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   devtoolsPlugin

package/dist/config.d.ts

@@ -1,15 +1,11 @@
-import { ClientDefinition } from '@modern-js/devtools-kit';
-import { PartialDeep } from 'type-fest';
-import { CliPluginAPI } from './types';
-export interface DevtoolsPluginOptions {
-  def?: PartialDeep<ClientDefinition>;
-}
+import { ClientDefinition, SetupClientParams } from '@modern-js/devtools-kit';
+import type { RequiredDeep } from 'type-fest';
+export type DevtoolsPluginOptions = Partial<SetupClientParams>;
 export interface DevtoolsPluginInlineOptions extends DevtoolsPluginOptions {
   enable?: boolean;
 }
+export type DevtoolsContext = RequiredDeep<DevtoolsPluginInlineOptions>;
 export declare const getDefaultOptions: () => {
   def: ClientDefinition;
 };
-export declare const resolveOptions: (api: CliPluginAPI, options?: DevtoolsPluginOptions) => DevtoolsPluginOptions & {
-  def: ClientDefinition;
-};
+export declare const resolveContext: (...sources: DevtoolsPluginInlineOptions[]) => DevtoolsContext;

package/dist/config.js

@@ -1,9 +1,7 @@
 "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)
@@ -17,33 +15,50 @@ var __copyProps = (to, from, except, desc) => {
   }
   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
+  resolveContext: () => resolveContext
 });
 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;
+const resolveContext = (...sources) => {
+  const ret = {
+    enable: process.env.NODE_ENV === "development",
+    dataSource: `${import_devtools_kit.ROUTE_BASENAME}/rpc`,
+    endpoint: import_devtools_kit.ROUTE_BASENAME,
+    def: new import_devtools_kit.ClientDefinition()
+  };
+  for (const opts of sources) {
+    var _opts_enable;
+    ret.enable = (_opts_enable = opts.enable) !== null && _opts_enable !== void 0 ? _opts_enable : ret.enable;
+    var _opts_dataSource;
+    ret.dataSource = (_opts_dataSource = opts.dataSource) !== null && _opts_dataSource !== void 0 ? _opts_dataSource : ret.dataSource;
+    var _opts_endpoint;
+    ret.endpoint = (_opts_endpoint = opts.endpoint) !== null && _opts_endpoint !== void 0 ? _opts_endpoint : ret.endpoint;
+    if (opts.def) {
+      if (opts.def.announcement) {
+        Object.assign(ret.def.announcement, opts.def.announcement);
+      }
+      if (opts.def.assets) {
+        Object.assign(ret.def.assets, opts.def.assets);
+      }
+      if (opts.def.name) {
+        Object.assign(ret.def.name, opts.def.name);
+      }
+      if (opts.def.packages) {
+        Object.assign(ret.def.packages, opts.def.packages);
+      }
+    }
+  }
+  return ret;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getDefaultOptions,
-  resolveOptions
+  resolveContext
 });

package/package.json

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

package/dist/runtime.d.ts

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

package/dist/runtime.js

@@ -1,11 +0,0 @@
-"use strict";
-var import_devtools_mount = require("@modern-js/devtools-mount");
-var import_ufo = require("ufo");
-try {
-  const opts = (0, import_ufo.parseQuery)(__resourceQuery);
-  (0, import_devtools_mount.mountDevTools)(opts);
-} catch (err) {
-  const e = new Error("Failed to execute mount point of DevTools.");
-  e.cause = err;
-  console.error(e);
-}