@livestore/devtools-expo 0.3.0-dev.17 → 0.3.0-dev.19

package/dist/metro-config.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// eslint-disable-next-line @typescript-eslint/no-require-imports, unicorn/prefer-module
-const { Effect_ } = require('@livestore/utils/effect');
+// eslint-disable-next-line @typescript-eslint/no-require-imports, unicorn/prefer-module, @typescript-eslint/consistent-type-imports
+const { Effect } = require('@livestore/utils/effect');
 /**
  * Patches the Metro config to add a middleware via `config.server.enhanceMiddleware`.
  */
@@ -14,7 +14,7 @@ const addLiveStoreDevtoolsMiddleware = (config, options) => {
     const previousEnhanceMiddleware = config.server.enhanceMiddleware;
     const enhanceMiddleware = (metroMiddleware, server) => {
         const enhancedMiddleware = previousEnhanceMiddleware(metroMiddleware, server);
-        return (req, res, next) => req.url?.startsWith('/livestore-devtools')
+        return (req, res, next) => req.url?.startsWith('/_livestore')
             ? viteMiddleware(req, res, () => enhancedMiddleware(req, res, next))
             : enhancedMiddleware(req, res, next);
     };
@@ -23,9 +23,17 @@ const addLiveStoreDevtoolsMiddleware = (config, options) => {
 const makeLiveStoreDevtoolsMiddleware = (options) => {
     // TODO Once Expo supports proper ESM, we can make this a static import
     // const viteServerPromise = makeViteServer(options)
-    const viteServerPromise = import('@livestore/adapter-node/devtools').then(({ makeViteServer }) => makeViteServer({ ...options, mode: { _tag: 'expo', storeId: 'default' } }).pipe(Effect_.runPromise));
+    const viteServerPromise = import('@livestore/adapter-node/devtools').then(({ makeViteServer }) => makeViteServer({
+        ...options,
+        mode: {
+            _tag: 'expo',
+            storeId: options.storeId ?? 'default',
+            clientId: options.clientId ?? 'expo',
+            sessionId: options.sessionId ?? 'expo',
+        },
+    }).pipe(Effect.runPromise));
     const middleware = async (req, res, next) => {
-        if (req.url?.startsWith('/livestore-devtools') == false) {
+        if (req.url?.startsWith('/_livestore') == false) {
             return next();
         }
         const viteServer = await viteServerPromise;

package/dist/metro-config.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"metro-config.cjs","sourceRoot":"","sources":["../src/metro-config.cts"],"names":[],"mappings":";;AAEA,wFAAwF;AACxF,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAMtD;;GAEG;AACH,MAAM,8BAA8B,GAAG,CAAC,MAAgC,EAAE,OAAgB,EAAE,EAAE;IAC5F,kCAAkC;IAClC,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC5C,OAAM;IACR,CAAC;IAED,MAAM,cAAc,GAAG,+BAA+B,CAAC,OAAO,CAAC,CAAA;IAE/D,MAAM,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC,iBAGjC,CAAA;IAEf,MAAM,iBAAiB,GAAG,CAAC,eAA2B,EAAE,MAAW,EAAc,EAAE;QACjF,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;QAE7E,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,CACxB,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,qBAAqB,CAAC;YACxC,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YACpE,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;IAC1C,CAAC,CAAA;IAED,MAAM,CAAC,MAAM,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;AACrD,CAAC,CAAA;AAED,MAAM,+BAA+B,GAAG,CAAC,OAAgB,EAAE,EAAE;IAC3D,uEAAuE;IACvE,oDAAoD;IACpD,MAAM,iBAAiB,GAAG,MAAM,CAAC,kCAAkC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,CAC/F,cAAc,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAC7E,OAAO,CAAC,UAAsC,CAC/C,CACF,CAAA;IAED,MAAM,UAAU,GAAG,KAAK,EAAE,GAAyB,EAAE,GAAwB,EAAE,IAAgB,EAAE,EAAE;QACjG,IAAI,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,qBAAqB,CAAC,IAAI,KAAK,EAAE,CAAC;YACxD,OAAO,IAAI,EAAE,CAAA;QACf,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAA;QAE1C,OAAO,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;IAC/C,CAAC,CAAA;IAED,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AAOD,iDAAiD;AACjD,MAAM,CAAC,OAAO,GAAG;IACf,8BAA8B;IAC9B,+BAA+B;CAChC,CAAA"}
+{"version":3,"file":"metro-config.cjs","sourceRoot":"","sources":["../src/metro-config.cts"],"names":[],"mappings":";;AAEA,oIAAoI;AACpI,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,yBAAyB,CAA6C,CAAA;AAMjG;;GAEG;AACH,MAAM,8BAA8B,GAAG,CAAC,MAAgC,EAAE,OAAgB,EAAE,EAAE;IAC5F,kCAAkC;IAClC,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC5C,OAAM;IACR,CAAC;IAED,MAAM,cAAc,GAAG,+BAA+B,CAAC,OAAO,CAAC,CAAA;IAE/D,MAAM,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC,iBAGjC,CAAA;IAEf,MAAM,iBAAiB,GAAG,CAAC,eAA2B,EAAE,MAAW,EAAc,EAAE;QACjF,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;QAE7E,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,CACxB,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,aAAa,CAAC;YAChC,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YACpE,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;IAC1C,CAAC,CAAA;IAED,MAAM,CAAC,MAAM,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;AACrD,CAAC,CAAA;AAED,MAAM,+BAA+B,GAAG,CAAC,OAAgB,EAAE,EAAE;IAC3D,uEAAuE;IACvE,oDAAoD;IACpD,MAAM,iBAAiB,GAAG,MAAM,CAAC,kCAAkC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,CAC/F,cAAc,CAAC;QACb,GAAG,OAAO;QACV,IAAI,EAAE;YACJ,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,SAAS;YACrC,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,MAAM;YACpC,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,MAAM;SACvC;KACF,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAC3B,CAAA;IAED,MAAM,UAAU,GAAG,KAAK,EAAE,GAAyB,EAAE,GAAwB,EAAE,IAAgB,EAAE,EAAE;QACjG,IAAI,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,aAAa,CAAC,IAAI,KAAK,EAAE,CAAC;YAChD,OAAO,IAAI,EAAE,CAAA;QACf,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAA;QAE1C,OAAO,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;IAC/C,CAAC,CAAA;IAED,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AAOD,iDAAiD;AACjD,MAAM,CAAC,OAAO,GAAG;IACf,8BAA8B;IAC9B,+BAA+B;CAChC,CAAA"}

package/dist/metro-config.d.cts

@@ -11,4 +11,5 @@ type MutableDeep<T> = {
     -readonly [P in keyof T]: MutableDeep<T[P]>;
 };
 export type { addLiveStoreDevtoolsMiddleware, makeLiveStoreDevtoolsMiddleware };
+export type { Options } from './types.js';
 //# sourceMappingURL=metro-config.d.cts.map

package/dist/metro-config.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"metro-config.d.cts","sourceRoot":"","sources":["../src/metro-config.cts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,IAAI,MAAM,WAAW,CAAA;AAKtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAEpD,OAAO,KAAK,EAAc,OAAO,EAAE,MAAM,YAAY,CAAA;AAErD;;GAEG;AACH,QAAA,MAAM,8BAA8B,GAAI,QAAQ,WAAW,CAAC,WAAW,CAAC,EAAE,SAAS,OAAO,SAuBzF,CAAA;AAED,QAAA,MAAM,+BAA+B,GAAI,SAAS,OAAO,WASxB,IAAI,CAAC,eAAe,OAAO,IAAI,CAAC,cAAc,QAAQ,MAAM,IAAI,kBAWhG,CAAA;AAED,0CAA0C;AAC1C,KAAK,WAAW,CAAC,CAAC,IAAI;IACpB,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC5C,CAAA;AAQD,YAAY,EAAE,8BAA8B,EAAE,+BAA+B,EAAE,CAAA"}
+{"version":3,"file":"metro-config.d.cts","sourceRoot":"","sources":["../src/metro-config.cts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,IAAI,MAAM,WAAW,CAAA;AAKtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAEpD,OAAO,KAAK,EAAc,OAAO,EAAE,MAAM,YAAY,CAAA;AAErD;;GAEG;AACH,QAAA,MAAM,8BAA8B,GAAI,QAAQ,WAAW,CAAC,WAAW,CAAC,EAAE,SAAS,OAAO,SAuBzF,CAAA;AAED,QAAA,MAAM,+BAA+B,GAAI,SAAS,OAAO,WAexB,IAAI,CAAC,eAAe,OAAO,IAAI,CAAC,cAAc,QAAQ,MAAM,IAAI,kBAWhG,CAAA;AAED,0CAA0C;AAC1C,KAAK,WAAW,CAAC,CAAC,IAAI;IACpB,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC5C,CAAA;AAQD,YAAY,EAAE,8BAA8B,EAAE,+BAA+B,EAAE,CAAA;AAC/E,YAAY,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA"}

package/package.json

@@ -1,25 +1,25 @@
 {
   "name": "@livestore/devtools-expo",
-  "version": "0.3.0-dev.17",
+  "version": "0.3.0-dev.19",
   "sideEffects": false,
   "types": "./dist/index.d.cts",
   "dependencies": {
-    "@livestore/devtools-vite": "0.3.0-dev.17",
+    "@livestore/devtools-vite": "0.3.0-dev.19",
     "@livestore/wa-sqlite": "1.0.5-dev.2",
     "vite": "6.1.0",
     "ws": "8.18.0",
-    "@livestore/utils": "0.3.0-dev.17",
-    "@livestore/adapter-web": "0.3.0-dev.17",
-    "@livestore/adapter-node": "0.3.0-dev.17"
+    "@livestore/adapter-node": "0.3.0-dev.19",
+    "@livestore/adapter-web": "0.3.0-dev.19",
+    "@livestore/utils": "0.3.0-dev.19"
   },
   "devDependencies": {
     "@types/node": "^22.10.10",
     "@types/ws": "^8.5.12",
-    "expo": "^52.0.18"
+    "expo": "^52.0.37"
   },
   "main": "./dist/index.cjs",
   "peerDependencies": {
-    "expo": "~52.0.18"
+    "expo": "~52.0.37"
   },
   "publishConfig": {
     "access": "public"

package/src/metro-config.cts

@@ -1,8 +1,8 @@
 import type * as http from 'node:http'
 
-// eslint-disable-next-line @typescript-eslint/no-require-imports, unicorn/prefer-module
-const { Effect_ } = require('@livestore/utils/effect')
-import type { Effect } from '@livestore/utils/effect' with { 'resolution-mode': 'import' }
+// eslint-disable-next-line @typescript-eslint/no-require-imports, unicorn/prefer-module, @typescript-eslint/consistent-type-imports
+const { Effect } = require('@livestore/utils/effect') as typeof import('@livestore/utils/effect')
+
 import type { MetroConfig } from 'expo/metro-config'
 
 import type { Middleware, Options } from './types.js'
@@ -27,7 +27,7 @@ const addLiveStoreDevtoolsMiddleware = (config: MutableDeep<MetroConfig>, option
     const enhancedMiddleware = previousEnhanceMiddleware(metroMiddleware, server)
 
     return (req, res, next) =>
-      req.url?.startsWith('/livestore-devtools')
+      req.url?.startsWith('/_livestore')
         ? viteMiddleware(req, res, () => enhancedMiddleware(req, res, next))
         : enhancedMiddleware(req, res, next)
   }
@@ -39,13 +39,19 @@ const makeLiveStoreDevtoolsMiddleware = (options: Options) => {
   // TODO Once Expo supports proper ESM, we can make this a static import
   // const viteServerPromise = makeViteServer(options)
   const viteServerPromise = import('@livestore/adapter-node/devtools').then(({ makeViteServer }) =>
-    makeViteServer({ ...options, mode: { _tag: 'expo', storeId: 'default' } }).pipe(
-      Effect_.runPromise as typeof Effect.runPromise,
-    ),
+    makeViteServer({
+      ...options,
+      mode: {
+        _tag: 'expo',
+        storeId: options.storeId ?? 'default',
+        clientId: options.clientId ?? 'expo',
+        sessionId: options.sessionId ?? 'expo',
+      },
+    }).pipe(Effect.runPromise),
   )
 
   const middleware = async (req: http.IncomingMessage, res: http.ServerResponse, next: () => void) => {
-    if (req.url?.startsWith('/livestore-devtools') == false) {
+    if (req.url?.startsWith('/_livestore') == false) {
       return next()
     }
 
@@ -69,3 +75,4 @@ module.exports = {
 }
 
 export type { addLiveStoreDevtoolsMiddleware, makeLiveStoreDevtoolsMiddleware }
+export type { Options } from './types.js'

package/src/types.d.ts

@@ -13,4 +13,7 @@ export type Options = {
    * Example: `./src/schema.ts`
    */
   schemaPath: string
+  storeId?: string
+  clientId?: string
+  sessionId?: string
 }

package/webui/index.html

@@ -6,7 +6,7 @@
     <title>LiveStore DevTools Redirect</title>
     <script>
         const currentUrl = new URL(window.location.href);
-        const redirectUrl = `http://localhost:${currentUrl.port}/livestore-devtools/`;
+        const redirectUrl = `http://localhost:${currentUrl.port}/_livestore`;
         window.location.href = redirectUrl;
     </script>
 </head>