@dxos/plugin-debug 0.8.4-main.c1de068 → 0.8.4-main.c85a9c8dae

package/package.json

@@ -1,15 +1,20 @@
 {
   "name": "@dxos/plugin-debug",
-  "version": "0.8.4-main.c1de068",
+  "version": "0.8.4-main.c85a9c8dae",
   "description": "DXOS Surface plugin for testing.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs"
     }
@@ -25,81 +30,85 @@
   "dependencies": {
     "@antv/graphlib": "^2.0.4",
     "@antv/layout": "^1.2.13",
-    "@automerge/automerge": "3.0.0",
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
+    "@automerge/automerge": "3.2.3",
+    "@effect-atom/atom": "^0.5.1",
+    "@effect-atom/atom-react": "^0.5.0",
     "@tldraw/tldraw": "^3.0.0",
     "date-fns": "^3.3.1",
     "react-json-tree": "^0.18.0",
     "react-resize-detector": "^11.0.1",
     "workerize-loader": "^2.0.2",
-    "@dxos/app-framework": "0.8.4-main.c1de068",
-    "@dxos/compute": "0.8.4-main.c1de068",
-    "@dxos/client-services": "0.8.4-main.c1de068",
-    "@dxos/conductor": "0.8.4-main.c1de068",
-    "@dxos/async": "0.8.4-main.c1de068",
-    "@dxos/context": "0.8.4-main.c1de068",
-    "@dxos/devtools": "0.8.4-main.c1de068",
-    "@dxos/config": "0.8.4-main.c1de068",
-    "@dxos/echo": "0.8.4-main.c1de068",
-    "@dxos/echo-generator": "0.8.4-main.c1de068",
-    "@dxos/echo-pipeline": "0.8.4-main.c1de068",
-    "@dxos/echo-schema": "0.8.4-main.c1de068",
-    "@dxos/invariant": "0.8.4-main.c1de068",
-    "@dxos/keys": "0.8.4-main.c1de068",
-    "@dxos/functions": "0.8.4-main.c1de068",
-    "@dxos/live-object": "0.8.4-main.c1de068",
-    "@dxos/local-storage": "0.8.4-main.c1de068",
-    "@dxos/plugin-client": "0.8.4-main.c1de068",
-    "@dxos/log": "0.8.4-main.c1de068",
-    "@dxos/plugin-deck": "0.8.4-main.c1de068",
-    "@dxos/plugin-graph": "0.8.4-main.c1de068",
-    "@dxos/plugin-markdown": "0.8.4-main.c1de068",
-    "@dxos/plugin-meeting": "0.8.4-main.c1de068",
-    "@dxos/plugin-script": "0.8.4-main.c1de068",
-    "@dxos/plugin-sheet": "0.8.4-main.c1de068",
-    "@dxos/plugin-sketch": "0.8.4-main.c1de068",
-    "@dxos/plugin-status-bar": "0.8.4-main.c1de068",
-    "@dxos/plugin-space": "0.8.4-main.c1de068",
-    "@dxos/plugin-table": "0.8.4-main.c1de068",
-    "@dxos/plugin-theme": "0.8.4-main.c1de068",
-    "@dxos/protocols": "0.8.4-main.c1de068",
-    "@dxos/random": "0.8.4-main.c1de068",
-    "@dxos/react-client": "0.8.4-main.c1de068",
-    "@dxos/react-hooks": "0.8.4-main.c1de068",
-    "@dxos/react-ui-attention": "0.8.4-main.c1de068",
-    "@dxos/react-ui-canvas-compute": "0.8.4-main.c1de068",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.c1de068",
-    "@dxos/react-ui-form": "0.8.4-main.c1de068",
-    "@dxos/react-ui-kanban": "0.8.4-main.c1de068",
-    "@dxos/react-ui-stack": "0.8.4-main.c1de068",
-    "@dxos/react-ui-table": "0.8.4-main.c1de068",
-    "@dxos/schema": "0.8.4-main.c1de068",
-    "@dxos/util": "0.8.4-main.c1de068",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.c1de068"
+    "@dxos/app-framework": "0.8.4-main.c85a9c8dae",
+    "@dxos/app-toolkit": "0.8.4-main.c85a9c8dae",
+    "@dxos/async": "0.8.4-main.c85a9c8dae",
+    "@dxos/blueprints": "0.8.4-main.c85a9c8dae",
+    "@dxos/assistant-toolkit": "0.8.4-main.c85a9c8dae",
+    "@dxos/compute": "0.8.4-main.c85a9c8dae",
+    "@dxos/context": "0.8.4-main.c85a9c8dae",
+    "@dxos/config": "0.8.4-main.c85a9c8dae",
+    "@dxos/devtools": "0.8.4-main.c85a9c8dae",
+    "@dxos/echo-generator": "0.8.4-main.c85a9c8dae",
+    "@dxos/conductor": "0.8.4-main.c85a9c8dae",
+    "@dxos/echo-pipeline": "0.8.4-main.c85a9c8dae",
+    "@dxos/echo": "0.8.4-main.c85a9c8dae",
+    "@dxos/effect": "0.8.4-main.c85a9c8dae",
+    "@dxos/functions": "0.8.4-main.c85a9c8dae",
+    "@dxos/invariant": "0.8.4-main.c85a9c8dae",
+    "@dxos/keys": "0.8.4-main.c85a9c8dae",
+    "@dxos/log": "0.8.4-main.c85a9c8dae",
+    "@dxos/operation": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-client": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-deck": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-inbox": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-markdown": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-graph": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-script": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-meeting": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-sketch": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-status-bar": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-table": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-theme": "0.8.4-main.c85a9c8dae",
+    "@dxos/protocols": "0.8.4-main.c85a9c8dae",
+    "@dxos/random": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-client": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-ui-attention": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-hooks": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-space": "0.8.4-main.c85a9c8dae",
+    "@dxos/plugin-sheet": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-ui-form": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-ui-mosaic": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-ui-stack": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.c85a9c8dae",
+    "@dxos/react-ui-table": "0.8.4-main.c85a9c8dae",
+    "@dxos/schema": "0.8.4-main.c85a9c8dae",
+    "@dxos/types": "0.8.4-main.c85a9c8dae",
+    "@dxos/client-services": "0.8.4-main.c85a9c8dae",
+    "@dxos/util": "0.8.4-main.c85a9c8dae"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.89.0",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "effect": "3.17.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/react-ui": "0.8.4-main.c1de068",
-    "@dxos/react-ui-theme": "0.8.4-main.c1de068",
-    "@dxos/storybook-utils": "0.8.4-main.c1de068"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "effect": "3.19.16",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^7.1.11",
+    "@dxos/react-ui": "0.8.4-main.c85a9c8dae",
+    "@dxos/storybook-utils": "0.8.4-main.c85a9c8dae",
+    "@dxos/ui-theme": "0.8.4-main.c85a9c8dae"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "^0.80.12",
-    "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/random": "0.8.4-main.c1de068",
-    "@dxos/react-ui-theme": "0.8.4-main.c1de068",
-    "@dxos/react-ui": "0.8.4-main.c1de068"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.19.16",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.c85a9c8dae",
+    "@dxos/ui-theme": "0.8.4-main.c85a9c8dae",
+    "@dxos/random": "0.8.4-main.c85a9c8dae"
   },
   "publishConfig": {
     "access": "public"

package/src/DebugPlugin.tsx

@@ -2,46 +2,41 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Capabilities, contributes, defineModule, definePlugin, Events } from '@dxos/app-framework';
+import * as Effect from 'effect/Effect';
+
+import { ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { type LogBuffer } from '@dxos/log';
 import { type Client } from '@dxos/react-client';
 
 import { AppGraphBuilder, DebugSettings, ReactContext, ReactSurface } from './capabilities';
 import { meta } from './meta';
 import { translations } from './translations';
 
-// TODO(wittjosiah): Rename to DevtoolsPlugin?
-export const DebugPlugin = () => {
-  setupDevtools();
-
-  return definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/settings`,
-      activatesOn: Events.SetupSettings,
-      activate: DebugSettings,
-    }),
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, translations),
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-context`,
-      activatesOn: Events.Startup,
-      activate: ReactContext,
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      activate: ReactSurface,
-    }),
-    defineModule({
-      id: `${meta.id}/module/app-graph-builder`,
-      activatesOn: Events.SetupAppGraph,
-      activate: AppGraphBuilder,
-    }),
-  ]);
+export type DebugPluginOptions = {
+  /** Shared log buffer for capturing and downloading logs. */
+  logBuffer: LogBuffer;
 };
 
+// TODO(wittjosiah): Factor out DevtoolsPlugin?
+export const DebugPlugin = Plugin.define<DebugPluginOptions>(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addReactContextModule({ activate: ReactContext }),
+  AppPlugin.addSettingsModule({ activate: DebugSettings }),
+  Plugin.addModule(({ logBuffer }) => ({
+    id: Capability.getModuleTag(ReactSurface) ?? 'surfaces',
+    activatesOn: ActivationEvents.SetupReactSurface,
+    activate: () => ReactSurface({ logBuffer }),
+  })),
+  AppPlugin.addTranslationsModule({ translations }),
+  Plugin.addModule({
+    id: 'setup-devtools',
+    activatesOn: ActivationEvents.Startup,
+    activate: () => Effect.sync(() => setupDevtools()),
+  }),
+  Plugin.make,
+);
+
 const setupDevtools = () => {
   (globalThis as any).composer ??= {};