@modern-js/devtools-kit 2.52.0 → 2.54.0

package/dist/channel.js

@@ -76,10 +76,10 @@ class WebSocketChannel {
   serialize(data) {
     return flatted.stringify([
       data
-    ], import_serializer.replacer);
+    ], (0, import_serializer.replacer)());
   }
   deserialize(e) {
-    const msg = flatted.parse(e.data.toString(), import_serializer.reviver)[0];
+    const msg = flatted.parse(e.data.toString(), (0, import_serializer.reviver)())[0];
     return msg;
   }
   constructor(ws) {

package/dist/mount-point.d.ts

@@ -3,7 +3,6 @@ export interface MountPointFunctions {
     getLocation: () => string;
 }
 export interface SetupClientParams {
-    endpoint: string;
-    dataSource: string;
+    src: string;
     def: ClientDefinition;
 }

package/dist/serializer.d.ts

@@ -1,2 +1,2 @@
-export declare function replacer(this: any, _key: string, value: any): any;
-export declare function reviver(this: any, _key: string, value: any): any;
+export declare function replacer(): (_key: string, value: any) => any;
+export declare function reviver(): (_key: string, value: any) => any;

package/dist/serializer.js

@@ -23,22 +23,40 @@ __export(serializer_exports, {
 });
 module.exports = __toCommonJS(serializer_exports);
 var import_promise = require("./promise");
-function replacer(_key, value) {
-  if ((0, import_promise.isPromiseLike)(value)) {
-    return {
-      __type__: "promise"
-    };
-  }
-  return value;
+function replacer() {
+  const memo = /* @__PURE__ */ new WeakSet();
+  return (_key, value) => {
+    if (typeof value === "object" && value !== null) {
+      if (memo.has(value)) {
+        return void 0;
+      }
+      memo.add(value);
+    }
+    if ((0, import_promise.isPromiseLike)(value)) {
+      return {
+        __type__: "promise"
+      };
+    }
+    return value;
+  };
 }
-function reviver(_key, value) {
-  if (!value || typeof value !== "object") {
+function reviver() {
+  const memo = /* @__PURE__ */ new WeakSet();
+  return (_key, value) => {
+    if (typeof value === "object" && value !== null) {
+      if (memo.has(value)) {
+        return void 0;
+      }
+      memo.add(value);
+    }
+    if (!value || typeof value !== "object") {
+      return value;
+    }
+    if (value.__type__ === "promise" && Object.keys(value).length === 1) {
+      return import_promise.PromiseStub.create().promise;
+    }
     return value;
-  }
-  if (value.__type__ === "promise" && Object.keys(value).length === 1) {
-    return import_promise.PromiseStub.create().promise;
-  }
-  return value;
+  };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/server.d.ts

@@ -4,7 +4,7 @@ import type { NormalizedConfig } from '@modern-js/core';
 import type { RouteLegacy, NestedRouteForCli, PageRoute } from '@modern-js/types';
 import type { Manifest } from '@rsdoctor/types';
 import type { StoragePresetConfig, StoragePresetContext, StoragePresetWithIdent } from './storage-preset';
-import type { ServerExportedState } from './state';
+import type { ExportedServerState } from './state';
 import type { ClientDefinition } from './client';
 export type BuilderContext = RsbuildContext;
 export type FrameworkConfig = UserConfig<AppTools>;
@@ -15,13 +15,11 @@ export type Aliases = NonNullable<NonNullable<WebpackConfig['resolve']>['alias']
 export type BundlerConfig = WebpackConfig | RspackConfig;
 export interface DevtoolsContext {
     enable: boolean;
-    endpoint: string;
-    dataSource: string;
     def: ClientDefinition;
     storagePresets: StoragePresetContext[];
 }
 export type Compiler = webpack.Compiler | Rspack.Compiler | webpack.MultiCompiler | Rspack.MultiCompiler;
-export type AppContext = Omit<IAppContext, 'builder' | 'serverInternalPlugins'>;
+export type AppContext = Omit<IAppContext, 'builder'>;
 export type FileSystemRoutes = RouteLegacy[] | (NestedRouteForCli | PageRoute)[];
 export interface DoctorManifestOverview {
     numModules: number;
@@ -38,7 +36,7 @@ export interface ResolvedDevtoolsConfig {
 }
 export interface ServerFunctions {
     echo: (content: string) => string;
-    pullExportedState: () => Promise<ServerExportedState>;
+    pullExportedState: () => Promise<ExportedServerState>;
     createTemporaryStoragePreset: () => Promise<StoragePresetWithIdent>;
     pasteStoragePreset: (target: {
         filename: string;

package/dist/state.d.ts

@@ -1,37 +1,74 @@
 import type { AppContext, BuilderConfig, BuilderContext, BundlerConfig, DevtoolsContext, DoctorManifestOverview, FileSystemRoutes, FrameworkConfig, NormalizedBuilderConfig, TransformedFrameworkConfig } from './server';
-import { type DeepToResolvers } from './promise';
-export interface ServerExportedState {
+export interface ServerState {
     framework: {
-        context: Promise<AppContext>;
+        context?: AppContext;
         config: {
-            resolved: Promise<FrameworkConfig>;
-            transformed: Promise<TransformedFrameworkConfig>;
+            resolved?: FrameworkConfig;
+            transformed?: TransformedFrameworkConfig;
         };
     };
     builder: {
-        context: Promise<BuilderContext>;
+        context?: BuilderContext;
         config: {
-            resolved: Promise<BuilderConfig>;
-            transformed: Promise<NormalizedBuilderConfig>;
+            resolved?: BuilderConfig;
+            transformed?: NormalizedBuilderConfig;
         };
     };
     bundler: {
         configs: {
-            resolved: Promise<BundlerConfig[]>;
-            transformed: Promise<BundlerConfig[]>;
+            resolved?: BundlerConfig[];
+            transformed?: BundlerConfig[];
         };
     };
-    doctor: Promise<DoctorManifestOverview | void>;
-    context: DevtoolsContext | Promise<DevtoolsContext>;
-    performance: Promise<{
+    doctor?: DoctorManifestOverview;
+    context: DevtoolsContext;
+    performance?: {
         compileDuration: number;
-    }>;
+    };
     dependencies: Record<string, string>;
     fileSystemRoutes: Record<string, FileSystemRoutes>;
 }
-export type ServerExportedStateResolvers = DeepToResolvers<ServerExportedState>;
-export interface ServerExportedStateResult {
-    resolvers: ServerExportedStateResolvers;
-    state: ServerExportedState;
+export interface ExportedServerState extends ServerState {
+    framework: {
+        context: AppContext;
+        config: {
+            resolved: FrameworkConfig;
+            transformed: TransformedFrameworkConfig;
+        };
+    };
+    builder: {
+        context: BuilderContext;
+        config: {
+            resolved: BuilderConfig;
+            transformed: NormalizedBuilderConfig;
+        };
+    };
+    bundler: {
+        configs: {
+            resolved: BundlerConfig[];
+            transformed: BundlerConfig[];
+        };
+    };
+    doctor?: DoctorManifestOverview;
+    context: DevtoolsContext;
+    performance: {
+        compileDuration: number;
+    };
+    dependencies: Record<string, string>;
+    fileSystemRoutes: Record<string, FileSystemRoutes>;
+}
+export interface RouteAsset {
+    chunkIds: string[];
+    assets: string[];
+    referenceCssAssets: [];
+}
+export interface ServerManifest extends ExportedServerState {
+    /** Original url of the served manifest file. */
+    source?: string;
+    /** WebSocket endpoint for live connection. */
+    websocket?: string;
+    /** Client endpoint for interactive panel. */
+    client: string;
+    /** Route assets. */
+    routeAssets: Record<string, RouteAsset>;
 }
-export declare const createServerExportedState: () => ServerExportedStateResult;

package/dist/state.js

@@ -3,10 +3,6 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 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))
@@ -17,72 +13,4 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var state_exports = {};
-__export(state_exports, {
-  createServerExportedState: () => createServerExportedState
-});
 module.exports = __toCommonJS(state_exports);
-var import_promise = require("./promise");
-const createServerExportedState = () => {
-  const resolvers = {
-    framework: {
-      context: import_promise.PromiseStub.create(),
-      config: {
-        resolved: import_promise.PromiseStub.create(),
-        transformed: import_promise.PromiseStub.create()
-      }
-    },
-    builder: {
-      context: import_promise.PromiseStub.create(),
-      config: {
-        resolved: import_promise.PromiseStub.create(),
-        transformed: import_promise.PromiseStub.create()
-      }
-    },
-    bundler: {
-      configs: {
-        resolved: import_promise.PromiseStub.create(),
-        transformed: import_promise.PromiseStub.create()
-      }
-    },
-    doctor: import_promise.PromiseStub.create(),
-    context: import_promise.PromiseStub.create(),
-    performance: import_promise.PromiseStub.create(),
-    dependencies: {},
-    fileSystemRoutes: {}
-  };
-  const state = {
-    framework: {
-      context: resolvers.framework.context.promise,
-      config: {
-        resolved: resolvers.framework.config.resolved.promise,
-        transformed: resolvers.framework.config.transformed.promise
-      }
-    },
-    builder: {
-      context: resolvers.builder.context.promise,
-      config: {
-        resolved: resolvers.builder.config.resolved.promise,
-        transformed: resolvers.builder.config.transformed.promise
-      }
-    },
-    bundler: {
-      configs: {
-        resolved: resolvers.bundler.configs.resolved.promise,
-        transformed: resolvers.bundler.configs.transformed.promise
-      }
-    },
-    doctor: resolvers.doctor.promise,
-    context: resolvers.context.promise,
-    performance: resolvers.performance.promise,
-    dependencies: resolvers.dependencies,
-    fileSystemRoutes: resolvers.fileSystemRoutes
-  };
-  return {
-    resolvers,
-    state
-  };
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createServerExportedState
-});

package/package.json

@@ -21,7 +21,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.52.0",
+  "version": "2.54.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -64,8 +64,8 @@
     "cookie-es": "^1.0.0",
     "@rsdoctor/types": "^0.2.4",
     "@rsdoctor/utils": "^0.2.4",
-    "@modern-js/types": "2.52.0",
-    "@modern-js/utils": "2.52.0"
+    "@modern-js/types": "2.54.0",
+    "@modern-js/utils": "2.54.0"
   },
   "devDependencies": {
     "@babel/core": "^7.23.2",
@@ -80,13 +80,13 @@
     "react": "~18.2.0",
     "type-fest": "^4.1.0",
     "typescript": "^5",
-    "@modern-js/app-tools": "2.52.0",
-    "@modern-js/core": "2.52.0",
-    "@modern-js/types": "2.52.0",
-    "@modern-js/module-tools": "2.52.0",
-    "@modern-js/uni-builder": "2.52.0",
-    "@scripts/build": "2.52.0",
-    "@scripts/jest-config": "2.52.0"
+    "@modern-js/core": "2.54.0",
+    "@modern-js/app-tools": "2.54.0",
+    "@modern-js/module-tools": "2.54.0",
+    "@modern-js/types": "2.54.0",
+    "@scripts/build": "2.54.0",
+    "@scripts/jest-config": "2.54.0",
+    "@modern-js/uni-builder": "2.54.0"
   },
   "peerDependencies": {
     "react": "~18.2.0"