@modern-js/plugin-devtools 0.0.0-next-20230920182238 → 0.0.0-next-20230921090041

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

@@ -18,61 +18,94 @@ _export(exports, {
   }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _lodash = /* @__PURE__ */ _interop_require_default._(require("@modern-js/utils/lodash"));
+const _http = /* @__PURE__ */ _interop_require_default._(require("http"));
+const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
+const _utils = require("@modern-js/utils");
+const _servestatic = /* @__PURE__ */ _interop_require_default._(require("serve-static"));
 const _devtoolskit = require("@modern-js/devtools-kit");
+const _ufo = require("ufo");
+const _config = require("./config");
 const _rpc = require("./rpc");
-const getDefaultOptions = () => ({
-  rpcPath: "/_modern_js/devtools/rpc",
-  def: new _devtoolskit.ClientDefinition()
-});
+const _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, _utils.getPort)(8782, {
+      slient: true
+    });
+    const clientServeDir = _path.default.resolve(require.resolve("@modern-js/devtools-client/package.json"), "../dist");
+    const serveMiddleware = (0, _servestatic.default)(clientServeDir);
+    const httpServer = _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 _socket.SocketServer({
+      server: httpServer,
+      path: "/rpc"
+    });
+    const rpc = await (0, _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, _config.resolveOptions)(api, options);
+        opts.def && rpc.setDefinition(opts.def);
+        const mountOpts = {
+          dataSource: `/_modern_js/devtools/rpc`,
+          endpoint: `/_modern_js/devtools`,
+          __keep: true
+        };
+        let runtimeEntry = require.resolve("@modern-js/plugin-devtools/runtime");
+        runtimeEntry = (0, _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 _devtoolskit.ClientDefinition().assets.logo
             }
           },
           tools: {
             devServer: {
               proxy: {
-                [opts.rpcPath]: {
-                  target: url.href,
-                  autoRewrite: true,
+                "/_modern_js/devtools": {
+                  target: `http://localhost:${port}`,
+                  pathRewrite: {
+                    "^/_modern_js/devtools": ""
+                  },
                   ws: true
                 }
               }

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,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
+  for (var name in all)
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  getDefaultOptions: function() {
+    return getDefaultOptions;
+  },
+  resolveOptions: function() {
+    return resolveOptions;
+  }
+});
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _devtoolskit = require("@modern-js/devtools-kit");
+const _lodash = /* @__PURE__ */ _interop_require_default._(require("@modern-js/utils/lodash"));
+const getDefaultOptions = () => ({
+  // prefix: '/_modern_js/devtools',
+  def: new _devtoolskit.ClientDefinition()
+});
+const resolveOptions = (api, options = {}) => {
+  const config = api.useConfigContext();
+  const opts = _lodash.default.defaultsDeep({}, options, config.devtools, getDefaultOptions());
+  return opts;
+};

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

@@ -14,8 +14,8 @@ _export(exports, {
     return _cli.devtoolsPlugin;
   },
   default: function() {
-    return _default;
+    return _cli.default;
   }
 });
-const _cli = require("./cli");
-const _default = _cli.devtoolsPlugin;
+const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
+const _cli = /* @__PURE__ */ _interop_require_wildcard._(require("./cli"));

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

@@ -9,21 +9,17 @@ Object.defineProperty(exports, "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");
 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) => {
@@ -197,6 +193,6 @@ const setupClientConnection = async (options) => {
     client: clientConn,
     hooks,
     builderPlugin,
-    url
+    setDefinition
   };
 };

package/dist/runtime.js

@@ -3,5 +3,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 const _devtoolsmount = require("@modern-js/devtools-mount");
-const opts = process.env.__MODERN_DEVTOOLS_MOUNT_OPTIONS;
+const _ufo = require("ufo");
+const opts = (0, _ufo.parseQuery)(__resourceQuery);
 (0, _devtoolsmount.mountDevTools)(opts);

package/package.json

@@ -15,10 +15,10 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-next-20230920182238",
+  "version": "0.0.0-next-20230921090041",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
-  "main": "./dist/cjs/index.js",
+  "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": "0.0.0-next-20230920182238",
-    "@modern-js/devtools-mount": "0.0.0-next-20230920182238",
-    "@modern-js/utils": "0.0.0-next-20230920182238"
+    "ufo": "^1.3.0",
+    "@modern-js/devtools-kit": "0.0.0-next-20230921090041",
+    "@modern-js/devtools-mount": "0.0.0-next-20230921090041",
+    "@modern-js/devtools-client": "0.0.0-next-20230921090041",
+    "@modern-js/utils": "0.0.0-next-20230921090041"
   },
   "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": "0.0.0-next-20230920182238",
-    "@modern-js/module-tools": "0.0.0-next-20230920182238",
-    "@modern-js/core": "0.0.0-next-20230920182238",
-    "@modern-js/runtime": "0.0.0-next-20230920182238",
-    "@modern-js/server-core": "0.0.0-next-20230920182238",
-    "@modern-js/types": "0.0.0-next-20230920182238",
-    "@modern-js/builder-rspack-provider": "0.0.0-next-20230920182238",
-    "@modern-js/builder-shared": "0.0.0-next-20230920182238",
-    "@modern-js/builder-webpack-provider": "0.0.0-next-20230920182238",
-    "@scripts/build": "0.0.0-next-20230920182238"
+    "@modern-js/app-tools": "0.0.0-next-20230921090041",
+    "@modern-js/core": "0.0.0-next-20230921090041",
+    "@modern-js/module-tools": "0.0.0-next-20230921090041",
+    "@modern-js/runtime": "0.0.0-next-20230921090041",
+    "@modern-js/server-core": "0.0.0-next-20230921090041",
+    "@modern-js/types": "0.0.0-next-20230921090041",
+    "@modern-js/builder-webpack-provider": "0.0.0-next-20230921090041",
+    "@modern-js/builder-rspack-provider": "0.0.0-next-20230921090041",
+    "@modern-js/builder-shared": "0.0.0-next-20230921090041",
+    "@scripts/build": "0.0.0-next-20230921090041"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "0.0.0-next-20230920182238"
+    "@modern-js/runtime": "0.0.0-next-20230921090041"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {