@dxos/shell 0.6.14-main.f49f251 → 0.6.14-staging.9e90729

package/dist/types/src/testing/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/testing/index.ts"],"names":[],"mappings":"AAIA,cAAc,YAAY,CAAC;AAC3B,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/testing/index.ts"],"names":[],"mappings":"AAMA,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC"}

package/dist/types/src/testing/index.js

@@ -17,7 +17,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./fixtures"), exports);
+// NOTE: Not exporting fixtures as they depend on esm-only packages.
 __exportStar(require("./scoped-shell-manager"), exports);
 __exportStar(require("./shell-manager"), exports);
 //# sourceMappingURL=index.js.map

package/dist/types/src/testing/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/testing/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;AAEF,6CAA2B;AAC3B,yDAAuC;AACvC,kDAAgC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/testing/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;AAEF,oEAAoE;AAEpE,yDAAuC;AACvC,kDAAgC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/shell",
-  "version": "0.6.14-main.f49f251",
+  "version": "0.6.14-staging.9e90729",
   "description": "DXOS’s OS experiences",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,8 +10,19 @@
   "exports": {
     ".": "./dist/bundle/shell.mjs",
     "./style.css": "./dist/bundle/style.css",
-    "./react": "./dist/lib/browser/react.mjs",
-    "./testing": "./dist/lib/browser/testing/index.mjs"
+    "./react": {
+      "types": "./dist/types/src/react.d.ts",
+      "browser": "./dist/lib/browser/react.mjs",
+      "node": "./dist/lib/node-esm/react.mjs"
+    },
+    "./testing": {
+      "types": "./dist/types/src/testing/index.d.ts",
+      "browser": "./dist/lib/browser/testing/index.mjs",
+      "node": {
+        "require": "./dist/lib/node/testing/index.cjs",
+        "default": "./dist/lib/node-esm/testing/index.mjs"
+      }
+    }
   },
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
@@ -42,18 +53,18 @@
     "react-qr-rounded": "^1.0.0",
     "url-join": "^5.0.0",
     "xstate": "^4.37.0",
-    "@dxos/client-protocol": "0.6.14-main.f49f251",
-    "@dxos/async": "0.6.14-main.f49f251",
-    "@dxos/client-services": "0.6.14-main.f49f251",
-    "@dxos/debug": "0.6.14-main.f49f251",
-    "@dxos/invariant": "0.6.14-main.f49f251",
-    "@dxos/log": "0.6.14-main.f49f251",
-    "@dxos/display-name": "0.6.14-main.f49f251",
-    "@dxos/protocols": "0.6.14-main.f49f251",
-    "@dxos/rpc": "0.6.14-main.f49f251",
-    "@dxos/react-ui-types": "0.6.14-main.f49f251",
-    "@dxos/rpc-tunnel": "0.6.14-main.f49f251",
-    "@dxos/util": "0.6.14-main.f49f251"
+    "@dxos/async": "0.6.14-staging.9e90729",
+    "@dxos/client-protocol": "0.6.14-staging.9e90729",
+    "@dxos/client-services": "0.6.14-staging.9e90729",
+    "@dxos/display-name": "0.6.14-staging.9e90729",
+    "@dxos/debug": "0.6.14-staging.9e90729",
+    "@dxos/invariant": "0.6.14-staging.9e90729",
+    "@dxos/protocols": "0.6.14-staging.9e90729",
+    "@dxos/react-ui-types": "0.6.14-staging.9e90729",
+    "@dxos/log": "0.6.14-staging.9e90729",
+    "@dxos/rpc": "0.6.14-staging.9e90729",
+    "@dxos/util": "0.6.14-staging.9e90729",
+    "@dxos/rpc-tunnel": "0.6.14-staging.9e90729"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -63,23 +74,23 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/config": "0.6.14-main.f49f251",
-    "@dxos/protocols": "0.6.14-main.f49f251",
-    "@dxos/random": "0.6.14-main.f49f251",
-    "@dxos/react-client": "0.6.14-main.f49f251",
-    "@dxos/react-hooks": "0.6.14-main.f49f251",
-    "@dxos/react-ui": "0.6.14-main.f49f251",
-    "@dxos/react-ui-theme": "0.6.14-main.f49f251",
-    "@dxos/storybook-utils": "0.6.14-main.f49f251",
-    "@dxos/test-utils": "0.6.14-main.f49f251"
+    "@dxos/config": "0.6.14-staging.9e90729",
+    "@dxos/protocols": "0.6.14-staging.9e90729",
+    "@dxos/random": "0.6.14-staging.9e90729",
+    "@dxos/react-client": "0.6.14-staging.9e90729",
+    "@dxos/react-hooks": "0.6.14-staging.9e90729",
+    "@dxos/react-ui": "0.6.14-staging.9e90729",
+    "@dxos/react-ui-theme": "0.6.14-staging.9e90729",
+    "@dxos/storybook-utils": "0.6.14-staging.9e90729",
+    "@dxos/test-utils": "0.6.14-staging.9e90729"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-client": "0.6.14-main.f49f251",
-    "@dxos/react-ui": "0.6.14-main.f49f251",
-    "@dxos/react-ui-theme": "0.6.14-main.f49f251"
+    "@dxos/react-ui": "0.6.14-staging.9e90729",
+    "@dxos/react-ui-theme": "0.6.14-staging.9e90729",
+    "@dxos/react-client": "0.6.14-staging.9e90729"
   },
   "publishConfig": {
     "access": "public"

package/src/components/IdentityList/SpaceMemberList.stories.tsx

@@ -9,7 +9,7 @@ import React from 'react';
 import { withTheme } from '@dxos/storybook-utils';
 
 import { SpaceMemberListImpl } from './SpaceMemberList';
-import { alice } from '../../testing';
+import { alice } from '../../testing/fixtures';
 
 export default {
   title: 'sdk/shell/SpaceMemberList',

package/src/components/InvitationList/InvitationList.stories.tsx

@@ -10,7 +10,7 @@ import { Invitation } from '@dxos/react-client/invitations';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { InvitationList } from './InvitationList';
-import { inviteWithState } from '../../testing';
+import { inviteWithState } from '../../testing/fixtures';
 
 export default {
   title: 'sdk/shell/InvitationList',

package/src/panels/SpacePanel/SpacePanel.stories.tsx

@@ -17,7 +17,7 @@ import { SpaceManagerImpl } from './steps';
 import { InvitationListItemImpl, SpaceMemberListImpl, InvitationList } from '../../components';
 import { StorybookDialog } from '../../components/StorybookDialog';
 import { InvitationManager, type InvitationManagerProps } from '../../steps';
-import { inviteWithState } from '../../testing';
+import { inviteWithState } from '../../testing/fixtures';
 
 const noOpProps: SpacePanelImplProps = {
   titleId: 'storybookSpacePanel__title',

package/src/playwright/invitations-manager.ts

@@ -6,7 +6,6 @@ import { expect, type Browser, type ConsoleMessage } from '@playwright/test';
 
 import { Trigger } from '@dxos/async';
 import { type Invitation } from '@dxos/react-client/invitations';
-import { ConnectionState } from '@dxos/react-client/mesh';
 import { setupPage } from '@dxos/test-utils/playwright';
 
 import { ScopedShellManager } from '../testing';
@@ -56,9 +55,9 @@ export class InvitationsManager extends ScopedShellManager {
 
     try {
       await selector.waitFor({ timeout: 500 });
-      return ConnectionState.OFFLINE;
+      return 0;
     } catch {
-      return ConnectionState.ONLINE;
+      return 1;
     }
   }
 

package/src/playwright/invitations.spec.ts

@@ -5,11 +5,16 @@
 import { expect, test } from '@playwright/test';
 
 import { sleep } from '@dxos/async';
-import { Invitation } from '@dxos/react-client/invitations';
-import { ConnectionState } from '@dxos/react-client/mesh';
 
 import { InvitationsManager } from './invitations-manager';
 
+// TODO(wittjosiah): Can't import these because of ESM/CJS issues.
+// import { Invitation } from '@dxos/react-client/invitations';
+// import { ConnectionState } from '@dxos/react-client/mesh';
+const InvitationAuthMethodNone = 0;
+const ConnectionStateOffline = 0;
+const ConnectionStateOnline = 1;
+
 test.describe('Invitations', () => {
   let manager: InvitationsManager;
 
@@ -51,7 +56,7 @@ test.describe('Invitations', () => {
     test('no auth method', async () => {
       await manager.createIdentity(0);
       await manager.openPanel(0, 'devices');
-      const invitation = await manager.createInvitation(0, 'device', { authMethod: Invitation.AuthMethod.NONE });
+      const invitation = await manager.createInvitation(0, 'device', { authMethod: InvitationAuthMethodNone });
 
       await manager.openPanel(1, 'identity');
       await manager.acceptInvitation(1, 'device', invitation);
@@ -155,9 +160,9 @@ test.describe('Invitations', () => {
       await manager.acceptInvitation(1, 'device', invitation);
       expect(await manager.readyToAuthenticate('device', manager.peer(1))).toBe(true);
       await manager.toggleNetworkStatus(0);
-      expect(await manager.getNetworkStatus(0)).toEqual(ConnectionState.OFFLINE);
+      expect(await manager.getNetworkStatus(0)).toEqual(ConnectionStateOffline);
       await manager.toggleNetworkStatus(0);
-      expect(await manager.getNetworkStatus(0)).toEqual(ConnectionState.ONLINE);
+      expect(await manager.getNetworkStatus(0)).toEqual(ConnectionStateOnline);
       await manager.resetInvitation(manager.peer(1));
       await manager.invitationInputContinue('device', manager.peer(1));
       await manager.clearAuthCode('device', manager.peer(1));
@@ -189,7 +194,7 @@ test.describe('Invitations', () => {
       await manager.createIdentity(0);
       await manager.createSpace(0);
       await manager.openPanel(0, 1);
-      const invitation1 = await manager.createInvitation(0, 'space', { authMethod: Invitation.AuthMethod.NONE });
+      const invitation1 = await manager.createInvitation(0, 'space', { authMethod: InvitationAuthMethodNone });
       const invitation2 = await manager.createInvitation(0, 'space');
 
       await manager.createIdentity(1);
@@ -206,7 +211,7 @@ test.describe('Invitations', () => {
       await manager.createIdentity(0);
       await manager.createSpace(0);
       await manager.openPanel(0, 1);
-      const invitation = await manager.createInvitation(0, 'space', { authMethod: Invitation.AuthMethod.NONE });
+      const invitation = await manager.createInvitation(0, 'space', { authMethod: InvitationAuthMethodNone });
 
       await manager.createIdentity(1);
       await manager.openPanel(1, 'join');
@@ -329,9 +334,9 @@ test.describe('Invitations', () => {
       await manager.acceptInvitation(1, 'space', invitation);
       expect(await manager.readyToAuthenticate('space', manager.peer(1))).toBe(true);
       await manager.toggleNetworkStatus(0);
-      expect(await manager.getNetworkStatus(0)).toEqual(ConnectionState.OFFLINE);
+      expect(await manager.getNetworkStatus(0)).toEqual(ConnectionStateOffline);
       await manager.toggleNetworkStatus(0);
-      expect(await manager.getNetworkStatus(0)).toEqual(ConnectionState.ONLINE);
+      expect(await manager.getNetworkStatus(0)).toEqual(ConnectionStateOnline);
       await manager.resetInvitation(manager.peer(1));
       await manager.invitationInputContinue('space', manager.peer(1));
       await manager.clearAuthCode('space', manager.peer(1));

package/src/testing/index.ts

@@ -2,6 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-export * from './fixtures';
+// NOTE: Not exporting fixtures as they depend on esm-only packages.
+
 export * from './scoped-shell-manager';
 export * from './shell-manager';