@expo/cli 55.0.0-canary-20260105-6b962e6 → 55.0.0-canary-20260119-70f7c28

package/build/src/start/server/MCPDevToolsPluginCLIExtensions.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "addMcpCapabilities", {
+    enumerable: true,
+    get: function() {
+        return addMcpCapabilities;
+    }
+});
+const _DevToolsPluginschema = require("./DevToolsPlugin.schema");
+const _DevToolsPluginCliExtensionExecutor = require("./DevToolsPluginCliExtensionExecutor");
+const _createMCPDevToolsExtensionSchema = require("./createMCPDevToolsExtensionSchema");
+const _log = require("../../log");
+const debug = require('debug')('expo:start:server:devtools:mcp');
+async function addMcpCapabilities(mcpServer, devServerManager) {
+    const plugins = await devServerManager.devtoolsPluginManager.queryPluginsAsync();
+    for (const plugin of plugins){
+        if (plugin.cliExtensions) {
+            const commands = (plugin.cliExtensions.commands ?? []).filter((p)=>{
+                var _p_environments;
+                return (_p_environments = p.environments) == null ? void 0 : _p_environments.includes('mcp');
+            });
+            if (commands.length === 0) {
+                continue;
+            }
+            const schema = (0, _createMCPDevToolsExtensionSchema.createMCPDevToolsExtensionSchema)(plugin);
+            debug(`Installing MCP CLI extension for plugin: ${plugin.packageName} - found ${commands.length} commands`);
+            mcpServer.registerTool(plugin.packageName, {
+                title: plugin.packageName,
+                description: plugin.description,
+                inputSchema: {
+                    parameters: schema
+                }
+            }, async ({ parameters })=>{
+                try {
+                    const { command, ...args } = parameters;
+                    const metroServerOrigin = devServerManager.getDefaultDevServer().getJsInspectorBaseUrl();
+                    const results = await new _DevToolsPluginCliExtensionExecutor.DevToolsPluginCliExtensionExecutor(plugin, devServerManager.projectRoot).execute({
+                        command,
+                        args,
+                        metroServerOrigin
+                    });
+                    const parsedResults = _DevToolsPluginschema.DevToolsPluginOutputSchema.safeParse(results);
+                    if (parsedResults.success === false) {
+                        throw new Error(`Invalid output from CLI command: ${parsedResults.error.issues.map((issue)=>issue.message).join(', ')}`);
+                    }
+                    return {
+                        content: parsedResults.data.map((line)=>{
+                            const { type } = line;
+                            if (type === 'text') {
+                                return {
+                                    type,
+                                    text: line.text,
+                                    level: line.level,
+                                    url: line.url
+                                };
+                            } else if (line.type === 'image' || line.type === 'audio') {
+                                // We could present this as a resource_link, but it seems not to be well supported in MCP clients,
+                                // so we'll return a text with the link instead.
+                                return {
+                                    type: 'text',
+                                    text: `${type} resource: ${line.url}${line.text ? ' (' + line.text + ')' : ''}`
+                                };
+                            }
+                            return null;
+                        }).filter((line)=>line !== null)
+                    };
+                } catch (e) {
+                    _log.Log.error('Error executing MCP CLI command:', e);
+                    return {
+                        content: [
+                            {
+                                type: 'text',
+                                text: `Error executing command: ${e.toString()}`
+                            }
+                        ],
+                        isError: true
+                    };
+                }
+            });
+        }
+    }
+}
+
+//# sourceMappingURL=MCPDevToolsPluginCLIExtensions.js.map

package/build/src/start/server/MCPDevToolsPluginCLIExtensions.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/start/server/MCPDevToolsPluginCLIExtensions.ts"],"sourcesContent":["import { DevServerManager } from './DevServerManager';\nimport { DevToolsPluginOutputSchema } from './DevToolsPlugin.schema';\nimport { DevToolsPluginCliExtensionExecutor } from './DevToolsPluginCliExtensionExecutor';\nimport { McpServer } from './MCP';\nimport { createMCPDevToolsExtensionSchema } from './createMCPDevToolsExtensionSchema';\nimport { Log } from '../../log';\n\nconst debug = require('debug')('expo:start:server:devtools:mcp');\n\nexport async function addMcpCapabilities(mcpServer: McpServer, devServerManager: DevServerManager) {\n  const plugins = await devServerManager.devtoolsPluginManager.queryPluginsAsync();\n\n  for (const plugin of plugins) {\n    if (plugin.cliExtensions) {\n      const commands = (plugin.cliExtensions.commands ?? []).filter((p) =>\n        p.environments?.includes('mcp')\n      );\n      if (commands.length === 0) {\n        continue;\n      }\n\n      const schema = createMCPDevToolsExtensionSchema(plugin);\n\n      debug(\n        `Installing MCP CLI extension for plugin: ${plugin.packageName} - found ${commands.length} commands`\n      );\n\n      mcpServer.registerTool(\n        plugin.packageName,\n        {\n          title: plugin.packageName,\n          description: plugin.description,\n          inputSchema: { parameters: schema },\n        },\n        async ({ parameters }) => {\n          try {\n            const { command, ...args } = parameters;\n\n            const metroServerOrigin = devServerManager\n              .getDefaultDevServer()\n              .getJsInspectorBaseUrl();\n\n            const results = await new DevToolsPluginCliExtensionExecutor(\n              plugin,\n              devServerManager.projectRoot\n            ).execute({ command, args, metroServerOrigin });\n\n            const parsedResults = DevToolsPluginOutputSchema.safeParse(results);\n            if (parsedResults.success === false) {\n              throw new Error(\n                `Invalid output from CLI command: ${parsedResults.error.issues\n                  .map((issue) => issue.message)\n                  .join(', ')}`\n              );\n            }\n            return {\n              content: parsedResults.data\n                .map((line) => {\n                  const { type } = line;\n                  if (type === 'text') {\n                    return { type, text: line.text, level: line.level, url: line.url };\n                  } else if (line.type === 'image' || line.type === 'audio') {\n                    // We could present this as a resource_link, but it seems not to be well supported in MCP clients,\n                    // so we'll return a text with the link instead.\n                    return {\n                      type: 'text',\n                      text: `${type} resource: ${line.url}${line.text ? ' (' + line.text + ')' : ''}`,\n                    } as const;\n                  }\n                  return null;\n                })\n                .filter((line): line is Exclude<typeof line, null> => line !== null),\n            };\n          } catch (e: any) {\n            Log.error('Error executing MCP CLI command:', e);\n            return {\n              content: [{ type: 'text', text: `Error executing command: ${e.toString()}` }],\n              isError: true,\n            };\n          }\n        }\n      );\n    }\n  }\n}\n"],"names":["addMcpCapabilities","debug","require","mcpServer","devServerManager","plugins","devtoolsPluginManager","queryPluginsAsync","plugin","cliExtensions","commands","filter","p","environments","includes","length","schema","createMCPDevToolsExtensionSchema","packageName","registerTool","title","description","inputSchema","parameters","command","args","metroServerOrigin","getDefaultDevServer","getJsInspectorBaseUrl","results","DevToolsPluginCliExtensionExecutor","projectRoot","execute","parsedResults","DevToolsPluginOutputSchema","safeParse","success","Error","error","issues","map","issue","message","join","content","data","line","type","text","level","url","e","Log","toString","isError"],"mappings":";;;;+BASsBA;;;eAAAA;;;sCARqB;oDACQ;kDAEF;qBAC7B;AAEpB,MAAMC,QAAQC,QAAQ,SAAS;AAExB,eAAeF,mBAAmBG,SAAoB,EAAEC,gBAAkC;IAC/F,MAAMC,UAAU,MAAMD,iBAAiBE,qBAAqB,CAACC,iBAAiB;IAE9E,KAAK,MAAMC,UAAUH,QAAS;QAC5B,IAAIG,OAAOC,aAAa,EAAE;YACxB,MAAMC,WAAW,AAACF,CAAAA,OAAOC,aAAa,CAACC,QAAQ,IAAI,EAAE,AAAD,EAAGC,MAAM,CAAC,CAACC;oBAC7DA;wBAAAA,kBAAAA,EAAEC,YAAY,qBAAdD,gBAAgBE,QAAQ,CAAC;;YAE3B,IAAIJ,SAASK,MAAM,KAAK,GAAG;gBACzB;YACF;YAEA,MAAMC,SAASC,IAAAA,kEAAgC,EAACT;YAEhDP,MACE,CAAC,yCAAyC,EAAEO,OAAOU,WAAW,CAAC,SAAS,EAAER,SAASK,MAAM,CAAC,SAAS,CAAC;YAGtGZ,UAAUgB,YAAY,CACpBX,OAAOU,WAAW,EAClB;gBACEE,OAAOZ,OAAOU,WAAW;gBACzBG,aAAab,OAAOa,WAAW;gBAC/BC,aAAa;oBAAEC,YAAYP;gBAAO;YACpC,GACA,OAAO,EAAEO,UAAU,EAAE;gBACnB,IAAI;oBACF,MAAM,EAAEC,OAAO,EAAE,GAAGC,MAAM,GAAGF;oBAE7B,MAAMG,oBAAoBtB,iBACvBuB,mBAAmB,GACnBC,qBAAqB;oBAExB,MAAMC,UAAU,MAAM,IAAIC,sEAAkC,CAC1DtB,QACAJ,iBAAiB2B,WAAW,EAC5BC,OAAO,CAAC;wBAAER;wBAASC;wBAAMC;oBAAkB;oBAE7C,MAAMO,gBAAgBC,gDAA0B,CAACC,SAAS,CAACN;oBAC3D,IAAII,cAAcG,OAAO,KAAK,OAAO;wBACnC,MAAM,IAAIC,MACR,CAAC,iCAAiC,EAAEJ,cAAcK,KAAK,CAACC,MAAM,CAC3DC,GAAG,CAAC,CAACC,QAAUA,MAAMC,OAAO,EAC5BC,IAAI,CAAC,OAAO;oBAEnB;oBACA,OAAO;wBACLC,SAASX,cAAcY,IAAI,CACxBL,GAAG,CAAC,CAACM;4BACJ,MAAM,EAAEC,IAAI,EAAE,GAAGD;4BACjB,IAAIC,SAAS,QAAQ;gCACnB,OAAO;oCAAEA;oCAAMC,MAAMF,KAAKE,IAAI;oCAAEC,OAAOH,KAAKG,KAAK;oCAAEC,KAAKJ,KAAKI,GAAG;gCAAC;4BACnE,OAAO,IAAIJ,KAAKC,IAAI,KAAK,WAAWD,KAAKC,IAAI,KAAK,SAAS;gCACzD,kGAAkG;gCAClG,gDAAgD;gCAChD,OAAO;oCACLA,MAAM;oCACNC,MAAM,GAAGD,KAAK,WAAW,EAAED,KAAKI,GAAG,GAAGJ,KAAKE,IAAI,GAAG,OAAOF,KAAKE,IAAI,GAAG,MAAM,IAAI;gCACjF;4BACF;4BACA,OAAO;wBACT,GACCrC,MAAM,CAAC,CAACmC,OAA6CA,SAAS;oBACnE;gBACF,EAAE,OAAOK,GAAQ;oBACfC,QAAG,CAACd,KAAK,CAAC,oCAAoCa;oBAC9C,OAAO;wBACLP,SAAS;4BAAC;gCAAEG,MAAM;gCAAQC,MAAM,CAAC,yBAAyB,EAAEG,EAAEE,QAAQ,IAAI;4BAAC;yBAAE;wBAC7EC,SAAS;oBACX;gBACF;YACF;QAEJ;IACF;AACF"}

package/build/src/start/server/createMCPDevToolsExtensionSchema.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "createMCPDevToolsExtensionSchema", {
+    enumerable: true,
+    get: function() {
+        return createMCPDevToolsExtensionSchema;
+    }
+});
+function _zod() {
+    const data = require("zod");
+    _zod = function() {
+        return data;
+    };
+    return data;
+}
+function createMCPDevToolsExtensionSchema(plugin) {
+    var _plugin_cliExtensions;
+    if (plugin.cliExtensions == null || ((_plugin_cliExtensions = plugin.cliExtensions) == null ? void 0 : _plugin_cliExtensions.commands.length) === 0) {
+        throw new Error(`Plugin ${plugin.packageName} has no commands defined. Please define at least one command.`);
+    }
+    const commands = plugin.cliExtensions.commands;
+    // Build a rich description that explains each command and its parameters
+    const commandDescriptions = commands.map((c)=>{
+        var _c_parameters;
+        const params = (_c_parameters = c.parameters) == null ? void 0 : _c_parameters.map((p)=>p.name).join(', ');
+        return params ? `"${c.name}": ${c.title} (params: ${params})` : `"${c.name}": ${c.title}`;
+    }).join('. ');
+    // Create enum of command names for clear LLM selection
+    const commandNames = commands.map((c)=>c.name);
+    // Collect all unique parameters across all commands
+    // Track which commands use each parameter for documentation
+    const parameterCommandMap = {};
+    const parameterDescriptions = {};
+    for (const command of commands){
+        if (command.parameters && command.parameters.length > 0) {
+            for (const param of command.parameters){
+                if (!parameterCommandMap[param.name]) {
+                    parameterCommandMap[param.name] = [];
+                    parameterDescriptions[param.name] = param.description || '';
+                }
+                parameterCommandMap[param.name].push(command.name);
+            }
+        }
+    }
+    // Build parameters with descriptions that indicate which command(s) they belong to
+    const allParameters = {};
+    for (const [paramName, commandList] of Object.entries(parameterCommandMap)){
+        const baseDescription = parameterDescriptions[paramName];
+        const commandsUsingParam = commandList.length === commands.length ? 'all commands' : commandList.map((c)=>`"${c}"`).join(', ');
+        // Include command context in the description so LLMs know when to use each parameter
+        const fullDescription = baseDescription ? `${baseDescription} (Used by: ${commandsUsingParam})` : `Parameter for: ${commandsUsingParam}`;
+        allParameters[paramName] = _zod().z.string().optional().describe(fullDescription);
+    }
+    // Build the command description with clear instructions for the LLM
+    const hasParameters = Object.keys(allParameters).length > 0;
+    const commandDescription = hasParameters ? `Required. The command to execute. You must select exactly one command from the enum values. ` + `Each command may require specific parameters - only include parameters that belong to the selected command. ` + `Commands: ${commandDescriptions}.` : `Required. The command to execute. Select exactly one from the available options. ` + `Commands: ${commandDescriptions}.`;
+    // Build the flat schema with additionalProperties: false for LLM compatibility
+    const schema = _zod().z.object({
+        command: _zod().z.enum(commandNames).describe(commandDescription),
+        ...allParameters
+    }).strict(); // .strict() adds additionalProperties: false
+    return schema;
+}
+
+//# sourceMappingURL=createMCPDevToolsExtensionSchema.js.map

package/build/src/start/server/createMCPDevToolsExtensionSchema.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/start/server/createMCPDevToolsExtensionSchema.ts"],"sourcesContent":["import { z } from 'zod';\n\nimport { DevToolsPlugin } from './DevToolsPlugin';\n\n/**\n * Creates an MCP-compatible JSON schema for a DevTools plugin's CLI extensions.\n *\n * LLM agents have varying support for complex JSON schema features like `anyOf`/`oneOf`\n * discriminated unions. This implementation uses a flat schema with an enum for the\n * command name, which provides the best compatibility across different LLM providers:\n *\n * - OpenAI: Supports `anyOf` but requires `additionalProperties: false` and all fields `required`\n * - Claude/Anthropic: Works best with simple flat schemas with enums\n * - Other providers: Generally have limited or inconsistent support for discriminated unions\n *\n * To compensate for the lack of discriminated unions, parameter descriptions include\n * which command(s) they belong to, and command descriptions include their parameters.\n *\n * The resulting schema structure is:\n * ```json\n * {\n *   \"type\": \"object\",\n *   \"properties\": {\n *     \"command\": {\n *       \"type\": \"string\",\n *       \"enum\": [\"cmd1\", \"cmd2\", ...],\n *       \"description\": \"The command to execute. Available commands: \\\"cmd1\\\" - Title 1 (params: foo); ...\"\n *     },\n *     \"foo\": { \"type\": \"string\", \"description\": \"Foo description (Used by: \\\"cmd1\\\")\" },\n *     ...\n *   },\n *   \"required\": [\"command\"],\n *   \"additionalProperties\": false\n * }\n * ```\n */\nexport function createMCPDevToolsExtensionSchema(plugin: DevToolsPlugin) {\n  if (plugin.cliExtensions == null || plugin.cliExtensions?.commands.length === 0) {\n    throw new Error(\n      `Plugin ${plugin.packageName} has no commands defined. Please define at least one command.`\n    );\n  }\n\n  const commands = plugin.cliExtensions.commands;\n\n  // Build a rich description that explains each command and its parameters\n  const commandDescriptions = commands\n    .map((c) => {\n      const params = c.parameters?.map((p) => p.name).join(', ');\n      return params ? `\"${c.name}\": ${c.title} (params: ${params})` : `\"${c.name}\": ${c.title}`;\n    })\n    .join('. ');\n\n  // Create enum of command names for clear LLM selection\n  const commandNames = commands.map((c) => c.name) as [string, ...string[]];\n\n  // Collect all unique parameters across all commands\n  // Track which commands use each parameter for documentation\n  const parameterCommandMap: Record<string, string[]> = {};\n  const parameterDescriptions: Record<string, string> = {};\n\n  for (const command of commands) {\n    if (command.parameters && command.parameters.length > 0) {\n      for (const param of command.parameters) {\n        if (!parameterCommandMap[param.name]) {\n          parameterCommandMap[param.name] = [];\n          parameterDescriptions[param.name] = param.description || '';\n        }\n        parameterCommandMap[param.name].push(command.name);\n      }\n    }\n  }\n\n  // Build parameters with descriptions that indicate which command(s) they belong to\n  const allParameters: Record<string, z.ZodTypeAny> = {};\n  for (const [paramName, commandList] of Object.entries(parameterCommandMap)) {\n    const baseDescription = parameterDescriptions[paramName];\n    const commandsUsingParam =\n      commandList.length === commands.length\n        ? 'all commands'\n        : commandList.map((c) => `\"${c}\"`).join(', ');\n\n    // Include command context in the description so LLMs know when to use each parameter\n    const fullDescription = baseDescription\n      ? `${baseDescription} (Used by: ${commandsUsingParam})`\n      : `Parameter for: ${commandsUsingParam}`;\n\n    allParameters[paramName] = z.string().optional().describe(fullDescription);\n  }\n\n  // Build the command description with clear instructions for the LLM\n  const hasParameters = Object.keys(allParameters).length > 0;\n  const commandDescription = hasParameters\n    ? `Required. The command to execute. You must select exactly one command from the enum values. ` +\n      `Each command may require specific parameters - only include parameters that belong to the selected command. ` +\n      `Commands: ${commandDescriptions}.`\n    : `Required. The command to execute. Select exactly one from the available options. ` +\n      `Commands: ${commandDescriptions}.`;\n\n  // Build the flat schema with additionalProperties: false for LLM compatibility\n  const schema = z\n    .object({\n      command: z.enum(commandNames).describe(commandDescription),\n      ...allParameters,\n    })\n    .strict(); // .strict() adds additionalProperties: false\n\n  return schema;\n}\n"],"names":["createMCPDevToolsExtensionSchema","plugin","cliExtensions","commands","length","Error","packageName","commandDescriptions","map","c","params","parameters","p","name","join","title","commandNames","parameterCommandMap","parameterDescriptions","command","param","description","push","allParameters","paramName","commandList","Object","entries","baseDescription","commandsUsingParam","fullDescription","z","string","optional","describe","hasParameters","keys","commandDescription","schema","object","enum","strict"],"mappings":"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"}

package/build/src/start/server/metro/DevToolsPluginWebsocketEndpoint.js

@@ -15,11 +15,19 @@ function _ws() {
     };
     return data;
 }
-function createDevToolsPluginWebsocketEndpoint() {
+const _net = require("../../../utils/net");
+function createDevToolsPluginWebsocketEndpoint({ serverBaseUrl }) {
     const wss = new (_ws()).WebSocketServer({
         noServer: true
     });
-    wss.on('connection', (ws)=>{
+    wss.on('connection', (ws, request)=>{
+        // Explicitly limit devtools websocket to loopback requests
+        if (!(0, _net.isLocalSocket)(request.socket) || !(0, _net.isMatchingOrigin)(request, serverBaseUrl)) {
+            // NOTE: `socket.close` nicely closes the websocket, which will still allow incoming messages
+            // `socket.terminate` instead forcefully closes down the socket
+            ws.terminate();
+            return;
+        }
         ws.on('message', (message, isBinary)=>{
             // Broadcast the received message to all other connected clients
             wss.clients.forEach((client)=>{

package/build/src/start/server/metro/DevToolsPluginWebsocketEndpoint.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/start/server/metro/DevToolsPluginWebsocketEndpoint.ts"],"sourcesContent":["import { WebSocket, WebSocketServer } from 'ws';\n\nexport function createDevToolsPluginWebsocketEndpoint(): Record<string, WebSocketServer> {\n  const wss = new WebSocketServer({ noServer: true });\n\n  wss.on('connection', (ws: WebSocket) => {\n    ws.on('message', (message, isBinary) => {\n      // Broadcast the received message to all other connected clients\n      wss.clients.forEach((client) => {\n        if (client !== ws && client.readyState === WebSocket.OPEN) {\n          client.send(message, { binary: isBinary });\n        }\n      });\n    });\n  });\n\n  return { '/expo-dev-plugins/broadcast': wss };\n}\n"],"names":["createDevToolsPluginWebsocketEndpoint","wss","WebSocketServer","noServer","on","ws","message","isBinary","clients","forEach","client","readyState","WebSocket","OPEN","send","binary"],"mappings":";;;;+BAEgBA;;;eAAAA;;;;yBAF2B;;;;;;AAEpC,SAASA;IACd,MAAMC,MAAM,IAAIC,CAAAA,KAAc,iBAAC,CAAC;QAAEC,UAAU;IAAK;IAEjDF,IAAIG,EAAE,CAAC,cAAc,CAACC;QACpBA,GAAGD,EAAE,CAAC,WAAW,CAACE,SAASC;YACzB,gEAAgE;YAChEN,IAAIO,OAAO,CAACC,OAAO,CAAC,CAACC;gBACnB,IAAIA,WAAWL,MAAMK,OAAOC,UAAU,KAAKC,eAAS,CAACC,IAAI,EAAE;oBACzDH,OAAOI,IAAI,CAACR,SAAS;wBAAES,QAAQR;oBAAS;gBAC1C;YACF;QACF;IACF;IAEA,OAAO;QAAE,+BAA+BN;IAAI;AAC9C"}
+{"version":3,"sources":["../../../../../src/start/server/metro/DevToolsPluginWebsocketEndpoint.ts"],"sourcesContent":["import { WebSocket, WebSocketServer } from 'ws';\n\nimport { isLocalSocket, isMatchingOrigin } from '../../../utils/net';\n\ninterface DevToolsPluginWebsocketEndpointParams {\n  serverBaseUrl: string;\n}\n\nexport function createDevToolsPluginWebsocketEndpoint({\n  serverBaseUrl,\n}: DevToolsPluginWebsocketEndpointParams): Record<string, WebSocketServer> {\n  const wss = new WebSocketServer({ noServer: true });\n\n  wss.on('connection', (ws, request) => {\n    // Explicitly limit devtools websocket to loopback requests\n    if (!isLocalSocket(request.socket) || !isMatchingOrigin(request, serverBaseUrl)) {\n      // NOTE: `socket.close` nicely closes the websocket, which will still allow incoming messages\n      // `socket.terminate` instead forcefully closes down the socket\n      ws.terminate();\n      return;\n    }\n\n    ws.on('message', (message, isBinary) => {\n      // Broadcast the received message to all other connected clients\n      wss.clients.forEach((client) => {\n        if (client !== ws && client.readyState === WebSocket.OPEN) {\n          client.send(message, { binary: isBinary });\n        }\n      });\n    });\n  });\n\n  return { '/expo-dev-plugins/broadcast': wss };\n}\n"],"names":["createDevToolsPluginWebsocketEndpoint","serverBaseUrl","wss","WebSocketServer","noServer","on","ws","request","isLocalSocket","socket","isMatchingOrigin","terminate","message","isBinary","clients","forEach","client","readyState","WebSocket","OPEN","send","binary"],"mappings":";;;;+BAQgBA;;;eAAAA;;;;yBAR2B;;;;;;qBAEK;AAMzC,SAASA,sCAAsC,EACpDC,aAAa,EACyB;IACtC,MAAMC,MAAM,IAAIC,CAAAA,KAAc,iBAAC,CAAC;QAAEC,UAAU;IAAK;IAEjDF,IAAIG,EAAE,CAAC,cAAc,CAACC,IAAIC;QACxB,2DAA2D;QAC3D,IAAI,CAACC,IAAAA,kBAAa,EAACD,QAAQE,MAAM,KAAK,CAACC,IAAAA,qBAAgB,EAACH,SAASN,gBAAgB;YAC/E,6FAA6F;YAC7F,+DAA+D;YAC/DK,GAAGK,SAAS;YACZ;QACF;QAEAL,GAAGD,EAAE,CAAC,WAAW,CAACO,SAASC;YACzB,gEAAgE;YAChEX,IAAIY,OAAO,CAACC,OAAO,CAAC,CAACC;gBACnB,IAAIA,WAAWV,MAAMU,OAAOC,UAAU,KAAKC,eAAS,CAACC,IAAI,EAAE;oBACzDH,OAAOI,IAAI,CAACR,SAAS;wBAAES,QAAQR;oBAAS;gBAC1C;YACF;QACF;IACF;IAEA,OAAO;QAAE,+BAA+BX;IAAI;AAC9C"}

package/build/src/start/server/metro/MetroBundlerDevServer.js

@@ -102,7 +102,6 @@ const _getStaticRenderFunctions = require("../getStaticRenderFunctions");
 const _resolveLoader = require("./resolveLoader");
 const _ContextModuleSourceMapsMiddleware = require("../middleware/ContextModuleSourceMapsMiddleware");
 const _CreateFileMiddleware = require("../middleware/CreateFileMiddleware");
-const _DataLoaderModuleMiddleware = require("../middleware/DataLoaderModuleMiddleware");
 const _DevToolsPluginMiddleware = require("../middleware/DevToolsPluginMiddleware");
 const _DomComponentsMiddleware = require("../middleware/DomComponentsMiddleware");
 const _FaviconMiddleware = require("../middleware/FaviconMiddleware");
@@ -285,6 +284,50 @@ class MetroBundlerDevServer extends _BundlerDevServer.BundlerDevServer {
             files
         };
     }
+    /**
+   * Bundle render module for use in SSR
+   */ async exportExpoRouterRenderModuleAsync({ files, includeSourceMaps, platform = 'web' }) {
+        const renderModule = await this.ssrLoadModuleContents('@expo/router-server/node/render.js', {
+            environment: 'node',
+            platform
+        });
+        await this.exportServerRouteAsync({
+            contents: renderModule,
+            artifactFilename: '_expo/server/render.js',
+            files,
+            includeSourceMaps,
+            descriptor: {
+                // ssrRenderModule: true,
+                targetDomain: 'server'
+            }
+        });
+        return files;
+    }
+    /**
+   * Export loader bundles as standalone JS files for SSR data loading.
+   *
+   * Each loader bundle contains only the `loader` export from the route file,
+   * with all other exports (default, named) stripped out by the Babel plugin.
+   * This keeps loader bundles small for efficient server-side execution.
+   */ async exportExpoRouterLoadersAsync({ platform, entryPoints, files, outputDir, includeSourceMaps }) {
+        // NOTE(@hassankhan): Should we parallelize loader bundling?
+        for (const entry of entryPoints){
+            const contents = await this.bundleLoader(entry.file, {
+                platform
+            });
+            const pagePath = entry.page.startsWith('/') ? entry.page.slice(1) : entry.page;
+            const artifactFilename = (0, _metroOptions.convertPathToModuleSpecifier)(_path().default.join(outputDir, pagePath + '.js'));
+            await this.exportServerRouteAsync({
+                contents,
+                artifactFilename,
+                files,
+                includeSourceMaps,
+                descriptor: {
+                    loaderId: entry.page
+                }
+            });
+        }
+    }
     async getExpoRouterRoutesManifestAsync({ appDir }) {
         var _exp_extra;
         // getBuiltTimeServerManifest
@@ -320,7 +363,7 @@ class MetroBundlerDevServer extends _BundlerDevServer.BundlerDevServer {
     /**
    * This function is invoked when exporting via `expo export`
    */ async getStaticRenderFunctionAsync() {
-        var _exp_extra, _exp_extra1;
+        var _exp_extra_router, _exp_extra, _exp_web, _exp_extra1, _exp_extra2;
         const { routerRoot } = this.instanceMetroOptions;
         (0, _assert().default)(routerRoot != null, 'The server must be started before calling getStaticRenderFunctionAsync.');
         const appDir = _path().default.join(this.projectRoot, routerRoot);
@@ -331,15 +374,19 @@ class MetroBundlerDevServer extends _BundlerDevServer.BundlerDevServer {
             environment: 'node'
         });
         const { exp } = (0, _config().getConfig)(this.projectRoot);
+        const useServerRendering = ((_exp_extra = exp.extra) == null ? void 0 : (_exp_extra_router = _exp_extra.router) == null ? void 0 : _exp_extra_router.unstable_useServerRendering) ?? false;
+        const isExportingWithSSR = ((_exp_web = exp.web) == null ? void 0 : _exp_web.output) === 'server' && useServerRendering && !this.isReactServerComponentsEnabled;
         const serverManifest = await getBuildTimeServerManifestAsync({
-            ...(_exp_extra = exp.extra) == null ? void 0 : _exp_extra.router
+            ...(_exp_extra1 = exp.extra) == null ? void 0 : _exp_extra1.router,
+            // Skip static params expansion in SSR mode, routes are matched at runtime instead
+            skipStaticParams: isExportingWithSSR
         });
         return {
             serverManifest,
             // Get routes from Expo Router.
             manifest: await getManifest({
                 preserveApiRoutes: false,
-                ...(_exp_extra1 = exp.extra) == null ? void 0 : _exp_extra1.router
+                ...(_exp_extra2 = exp.extra) == null ? void 0 : _exp_extra2.router
             }),
             // Get route generating function
             renderAsync: async (path, route, opts)=>{
@@ -355,7 +402,7 @@ class MetroBundlerDevServer extends _BundlerDevServer.BundlerDevServer {
                 if (!resolvedLoaderRoute) {
                     return undefined;
                 }
-                return await this.executeServerDataLoaderAsync(location, resolvedLoaderRoute);
+                return this.executeServerDataLoaderAsync(location, resolvedLoaderRoute);
             }
         };
     }
@@ -385,7 +432,7 @@ class MetroBundlerDevServer extends _BundlerDevServer.BundlerDevServer {
     }
     /**
    * This function is invoked when running in development via `expo start`
-   */ async getStaticPageAsync(pathname, route) {
+   */ async getStaticPageAsync(pathname, route, request) {
         const { exp } = (0, _config().getConfig)(this.projectRoot);
         const { mode, isExporting, clientBoundaries, baseUrl, reactCompiler, routerRoot, asyncRoutes } = this.instanceMetroOptions;
         (0, _assert().default)(mode != null && isExporting != null && baseUrl != null && reactCompiler != null && routerRoot != null && asyncRoutes != null, 'The server must be started before calling getStaticPageAsync.');
@@ -426,10 +473,13 @@ class MetroBundlerDevServer extends _BundlerDevServer.BundlerDevServer {
             if (!resolvedLoaderRoute) {
                 return await getStaticContent(location);
             }
-            const data = await this.executeServerDataLoaderAsync(location, resolvedLoaderRoute);
+            const loaderResult = await this.executeServerDataLoaderAsync(location, resolvedLoaderRoute, request);
+            if (!loaderResult) {
+                return await getStaticContent(location);
+            }
             return await getStaticContent(location, {
                 loader: {
-                    data
+                    data: loaderResult.data
                 }
             });
         };
@@ -857,18 +907,6 @@ class MetroBundlerDevServer extends _BundlerDevServer.BundlerDevServer {
             });
             // Append support for redirecting unhandled requests to the index.html page on web.
             if (this.isTargetingWeb()) {
-                var _exp_extra_router1, _exp_extra2;
-                if ((_exp_extra2 = exp.extra) == null ? void 0 : (_exp_extra_router1 = _exp_extra2.router) == null ? void 0 : _exp_extra_router1.unstable_useServerDataLoaders) {
-                    const loaderModuleMiddleware = new _DataLoaderModuleMiddleware.DataLoaderModuleMiddleware(this.projectRoot, appDir, async (location, route)=>{
-                        const resolvedLoaderRoute = (0, _resolveLoader.fromServerManifestRoute)(location.pathname, route);
-                        if (!resolvedLoaderRoute) {
-                            return;
-                        }
-                        return this.executeServerDataLoaderAsync(location, resolvedLoaderRoute);
-                    }, ()=>this.getDevServerUrlOrAssert());
-                    // This MUST be before ServeStaticMiddleware so it doesn't treat the loader files as static assets
-                    middleware.use(loaderModuleMiddleware.getHandler());
-                }
                 // This MUST be after the manifest middleware so it doesn't have a chance to serve the template `public/index.html`.
                 middleware.use(new _ServeStaticMiddleware.ServeStaticMiddleware(this.projectRoot).getHandler());
                 // This should come after the static middleware so it doesn't serve the favicon from `public/favicon.ico`.
@@ -940,7 +978,19 @@ class MetroBundlerDevServer extends _BundlerDevServer.BundlerDevServer {
                         bundleApiRoute: (functionFilePath)=>this.ssrImportApiRoute(functionFilePath, {
                                 platform: 'web'
                             }),
-                        getStaticPageAsync: async (pathname, route)=>{
+                        executeLoaderAsync: async (route, request)=>{
+                            var _exp_web, _exp_extra_router, _exp_extra;
+                            const url = new URL(request.url);
+                            const resolvedLoaderRoute = (0, _resolveLoader.fromServerManifestRoute)(url.pathname, route);
+                            if (!resolvedLoaderRoute) {
+                                return undefined;
+                            }
+                            // Only pass the request in SSR mode (server output with SSR enabled).
+                            // In static mode, loaders should not receive request data.
+                            const isSSREnabled = ((_exp_web = exp.web) == null ? void 0 : _exp_web.output) === 'server' && ((_exp_extra = exp.extra) == null ? void 0 : (_exp_extra_router = _exp_extra.router) == null ? void 0 : _exp_extra_router.unstable_useServerRendering) === true;
+                            return this.executeServerDataLoaderAsync(url, resolvedLoaderRoute, isSSREnabled ? request : undefined);
+                        },
+                        getStaticPageAsync: async (pathname, route, request)=>{
                             // TODO: Add server rendering when RSC is enabled.
                             if (isReactServerComponentsEnabled) {
                                 // NOTE: This is a temporary hack to return the SPA/template index.html in development when RSC is enabled.
@@ -951,7 +1001,7 @@ class MetroBundlerDevServer extends _BundlerDevServer.BundlerDevServer {
                                 };
                             }
                             // Non-RSC apps will bundle the static HTML for a given pathname and respond with it.
-                            return this.getStaticPageAsync(pathname, route);
+                            return this.getStaticPageAsync(pathname, route, request);
                         }
                     }));
                 }
@@ -1183,13 +1233,15 @@ class MetroBundlerDevServer extends _BundlerDevServer.BundlerDevServer {
         this.pendingRouteOperations.clear();
     }
     /**
-   * Execute a route's loader function. Used during SSR/SSG to fetch data required by routes.
+   * Execute a route's loader function. Used during development and SSG to fetch data required by
+   * routes.
    *
    * This function is used during development and production builds, and **must** receive a valid
    * matched route.
    *
    * @experimental
-   */ async executeServerDataLoaderAsync(location, route) {
+   */ async executeServerDataLoaderAsync(location, route, // The `request` object is only available when using SSR
+    request) {
         var _exp_extra;
         const { exp } = (0, _config().getConfig)(this.projectRoot);
         const { unstable_useServerDataLoaders } = (_exp_extra = exp.extra) == null ? void 0 : _exp_extra.router;
@@ -1198,7 +1250,6 @@ class MetroBundlerDevServer extends _BundlerDevServer.BundlerDevServer {
         }
         const { routerRoot } = this.instanceMetroOptions;
         (0, _assert().default)(routerRoot != null, 'The server must be started before calling executeRouteLoaderAsync.');
-        let loaderData;
         try {
             debug(`Matched ${location.pathname} to file: ${route.file}`);
             const appDir = _path().default.join(this.projectRoot, routerRoot);
@@ -1207,22 +1258,43 @@ class MetroBundlerDevServer extends _BundlerDevServer.BundlerDevServer {
             modulePath = modulePath.replace(/\.(js|ts)x?$/, '');
             debug('Using loader module path: ', modulePath);
             const routeModule = await this.ssrLoadModule(modulePath, {
-                environment: 'node'
+                environment: 'node',
+                isLoaderBundle: true
             });
             if (routeModule.loader) {
                 // Register this module for loader HMR
                 this.setupLoaderHmr(modulePath);
-                loaderData = await routeModule.loader({
+                const data = await routeModule.loader({
                     params: route.params,
-                    // NOTE(@hassankhan): The `request` object should only be available when using SSR
-                    request: null
+                    request
                 });
+                const normalizedData = data === undefined ? {} : data;
+                debug('Loader data:', normalizedData, ' for location:', location.pathname);
+                return {
+                    data: normalizedData
+                };
             }
+            debug('No loader found for location:', location.pathname);
+            return undefined;
         } catch (error) {
             throw new _errors.CommandError('LOADER_EXECUTION_FAILED', `Failed to execute loader for route "${location.pathname}": ${error.message}`);
         }
-        debug('Loader data:', loaderData, ' for location:', location.pathname);
-        return loaderData;
+    }
+    /**
+   * Bundle a loader module with Metro and return the string contents.
+   */ async bundleLoader(filePath, { platform }) {
+        try {
+            debug('Bundle loader:', filePath);
+            return await this.ssrLoadModuleContents(filePath, {
+                isExporting: this.instanceMetroOptions.isExporting,
+                platform,
+                environment: 'node',
+                isLoaderBundle: true
+            });
+        } catch (error) {
+            debug('Failed to bundle loader:', filePath, ':', error.message);
+            throw new _errors.CommandError('LOADER_BUNDLE', (0, _chalk().default)`Failed to bundle loader: {bold ${filePath}}\n\n` + error.message);
+        }
     }
     // Ensure the global is available for SSR CSS modules to inject client updates.
     bindRSCDevModuleInjectionHandler() {