@modern-js/plugin-devtools 2.45.0 → 2.46.0

package/dist/rpc/index.d.ts

@@ -1,7 +1,7 @@
 import { 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 type { RsbuildPlugin } from '@modern-js/uni-builder';
+import { CliPluginAPI, InjectedHooks } from '../types';
 import { SocketServer } from '../utils/socket';
 export interface SetupClientConnectionOptions {
     api: CliPluginAPI;
@@ -10,6 +10,6 @@ export interface SetupClientConnectionOptions {
 export declare const setupClientConnection: (options: SetupClientConnectionOptions) => Promise<{
     client: import("birpc").BirpcReturn<ClientFunctions, ServerFunctions>;
     hooks: InjectedHooks;
-    builderPlugin: BuilderPlugin<BuilderPluginAPI>;
+    builderPlugin: RsbuildPlugin;
     setDefinition: (definition: PartialDeep<ClientDefinition>) => void;
 }>;

package/dist/rpc/index.js

@@ -125,12 +125,14 @@ const setupClientConnection = async (options) => {
         webpack: [
           ctx.rootPath,
           "@modern-js/app-tools",
-          "@modern-js/builder-webpack-provider",
+          "@modern-js/uni-builder",
+          "@rsbuild/webpack",
           "webpack/package.json"
         ],
         "@rspack/core": [
           ctx.rootPath,
-          "@modern-js/builder-rspack-provider",
+          "@modern-js/uni-builder",
+          "@rsbuild/core",
           "@rspack/core/package.json"
         ]
       };
@@ -181,11 +183,11 @@ const setupClientConnection = async (options) => {
     setup(api2) {
       deferred.builder.context.resolve(import_lodash.default.cloneDeep(api2.context));
       api2.modifyBundlerChain(() => {
-        deferred.builder.config.resolved.resolve(import_lodash.default.cloneDeep(api2.getBuilderConfig()));
+        deferred.builder.config.resolved.resolve(import_lodash.default.cloneDeep(api2.getRsbuildConfig()));
         deferred.builder.config.transformed.resolve(import_lodash.default.cloneDeep(api2.getNormalizedConfig()));
       });
-      const modifyBundlerConfig = "modifyWebpackConfig" in api2 ? api2.modifyWebpackConfig : api2.modifyRspackConfig;
-      const expectBundlerNum = import_lodash.default.castArray(api2.context.target).length;
+      const modifyBundlerConfig = api2.context.bundlerType === "webpack" ? api2.modifyWebpackConfig : api2.modifyRspackConfig;
+      const expectBundlerNum = import_lodash.default.castArray(api2.context.targets).length;
       const bundlerConfigs = [];
       modifyBundlerConfig((config) => {
         bundlerConfigs.push(config);

package/dist/types.d.ts

@@ -1,12 +1,9 @@
 /// <reference types="node" />
 import { BaseHooks } from '@modern-js/core';
-import type { BuilderPluginAPI as WebpackBuilderAPI } from '@modern-js/builder-webpack-provider';
-import type { BuilderPluginAPI as RspackBuilderAPI } from '@modern-js/builder-rspack-provider';
 import type { AppTools, AppToolsHooks, CliPlugin } from '@modern-js/app-tools';
 import type { ServerPlugin, ToThreads } from '@modern-js/server-core';
 export type CliPluginAPI = Parameters<NonNullable<CliPlugin<AppTools>['setup']>>[0];
 export type ServerPluginAPI = Parameters<NonNullable<ServerPlugin['setup']>>[0];
-export type BuilderPluginAPI = WebpackBuilderAPI | RspackBuilderAPI;
 export type BufferLike = string | Buffer | DataView | number | ArrayBufferView | Uint8Array | ArrayBuffer | SharedArrayBuffer | ReadonlyArray<any> | ReadonlyArray<number> | {
     valueOf: () => ArrayBuffer;
 } | {

package/dist/utils/socket.d.ts

@@ -12,7 +12,6 @@ export interface SendMessageOptions {
 }
 export type ServerOptions<U extends typeof WebSocket.WebSocket = typeof WebSocket.WebSocket, V extends typeof IncomingMessage = typeof IncomingMessage> = WebSocket.Server<U, V>['options'];
 export declare class SocketServer<T extends typeof WebSocket.WebSocket = typeof WebSocket.WebSocket, U extends typeof IncomingMessage = typeof IncomingMessage> extends WebSocket.Server<T, U> {
-    constructor(options?: ServerOptions<T, U>, callback?: () => void);
     handleHeartbeat(timeout?: number): void;
     broadcast(data: BufferLike, cb?: (err?: Error) => void): void;
     broadcast(data: BufferLike, options: SendMessageOptions, cb?: (err?: Error) => void): void;

package/dist/utils/socket.js

@@ -33,6 +33,10 @@ __export(socket_exports, {
 module.exports = __toCommonJS(socket_exports);
 var import_ws = __toESM(require("ws"));
 class SocketServer extends import_ws.default.Server {
+  // constructor(options?: ServerOptions<T, U>, callback?: () => void) {
+  //   super(options, callback);
+  //   this.handleHeartbeat();
+  // }
   handleHeartbeat(timeout = 3e4) {
     const aliveMapping = /* @__PURE__ */ new WeakMap();
     function heartbeat() {
@@ -63,10 +67,6 @@ class SocketServer extends import_ws.default.Server {
     const cb = typeof optsOrCb === "function" ? optsOrCb : cbOrNone;
     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 = {

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.45.0",
+  "version": "2.46.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -45,9 +45,9 @@
     "p-defer": "^3.0.0",
     "ws": "^8.13.0",
     "ufo": "^1.3.0",
-    "@modern-js/devtools-kit": "2.45.0",
-    "@modern-js/utils": "2.45.0",
-    "@modern-js/devtools-client": "2.45.0"
+    "@modern-js/devtools-kit": "2.46.0",
+    "@modern-js/devtools-client": "2.46.0",
+    "@modern-js/utils": "2.46.0"
   },
   "devDependencies": {
     "@types/serve-static": "^1.13.10",
@@ -56,19 +56,17 @@
     "@types/ws": "^8.5.5",
     "type-fest": "^4.1.0",
     "typescript": "^5",
-    "@modern-js/app-tools": "2.45.0",
-    "@modern-js/core": "2.45.0",
-    "@modern-js/module-tools": "2.45.0",
-    "@modern-js/runtime": "2.45.0",
-    "@modern-js/builder-webpack-provider": "2.45.0",
-    "@modern-js/server-core": "2.45.0",
-    "@modern-js/types": "2.45.0",
-    "@modern-js/builder-rspack-provider": "2.45.0",
-    "@modern-js/builder-shared": "2.45.0",
-    "@scripts/build": "2.45.0"
+    "@modern-js/app-tools": "2.46.0",
+    "@modern-js/core": "2.46.0",
+    "@modern-js/module-tools": "2.46.0",
+    "@modern-js/runtime": "2.46.0",
+    "@modern-js/types": "2.46.0",
+    "@modern-js/server-core": "2.46.0",
+    "@modern-js/uni-builder": "2.46.0",
+    "@scripts/build": "2.46.0"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "^2.45.0"
+    "@modern-js/runtime": "^2.46.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {