@expo/router-server 58.0.0 → 58.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -195,6 +195,7 @@ async function getStreamingContent(location, options) {
195
195
  const { headNodes: externalCssNodes } = (0, _react1.createInjectedExternalCssAsNodes)(options?.assets?.externalCss);
196
196
  const { headNodes: inlineCssNodes } = (0, _react1.createInjectedInlineCssAsNodes)(options?.assets?.inlineCss);
197
197
  const faviconNode = options?.assets?.favicon ? (0, _react1.createFaviconAsNode)(options?.assets?.favicon) : undefined;
198
+ const { headNodes: headJsNodes, bodyNodes: bodyJsNodes } = (0, _react1.createInjectedScriptAsNodes)(options?.assets?.js ?? []);
198
199
  const serverDocumentData = {
199
200
  headNodes: [
200
201
  ...options?.metadata?.headNodes ?? [],
@@ -204,10 +205,14 @@ async function getStreamingContent(location, options) {
204
205
  }),
205
206
  ...headCssNodes ?? [],
206
207
  ...externalCssNodes ?? [],
207
- ...inlineCssNodes ?? []
208
+ ...inlineCssNodes ?? [],
209
+ ...headJsNodes ?? []
208
210
  ].filter(Boolean),
211
+ // NOTE(@hassankhan): React's bootstrapScripts emits async scripts, but Metro chunks must
212
+ // execute in asset order so the runtime initializes before dependent chunks.
209
213
  bodyNodes: [
210
- /*#__PURE__*/ (0, _jsxruntime().jsx)(FontResources, {}, "font-resources")
214
+ /*#__PURE__*/ (0, _jsxruntime().jsx)(FontResources, {}, "font-resources"),
215
+ ...bodyJsNodes ?? []
211
216
  ]
212
217
  };
213
218
  return _server2().default.renderToReadableStream(/*#__PURE__*/ (0, _jsxruntime().jsx)(_server1().ServerDocument, {
@@ -227,7 +232,6 @@ async function getStreamingContent(location, options) {
227
232
  hydrate: true,
228
233
  loadedData
229
234
  }),
230
- bootstrapScripts: options?.assets?.js,
231
235
  signal: options?.request?.signal,
232
236
  onError (error) {
233
237
  if (options?.request?.signal.aborted) {
@@ -1 +1 @@
1
- {"version":3,"sources":["server/renderStreamingContent.tsx"],"sourcesContent":[null],"names":["getStreamingContent","resolveMetadata","debug","createDebug","resetReactNavigationContexts","contexts","globalThis","Map","prepareRenderContext","location","options","headContext","Root","getRootComponent","element","getStyleElement","registerStaticRootComponent","ExpoRoot","context","ctx","wrapper","children","div","id","loaderKey","loader","key","search","loadedData","data","FontResources","descriptors","Font","getServerResourceDescriptors","length","createInjectedFontsAsNodes","withServerContext","headNodes","headCssNodes","createInjectedCssAsNodes","assets","css","externalCssNodes","createInjectedExternalCssAsNodes","externalCss","inlineCssNodes","createInjectedInlineCssAsNodes","inlineCss","faviconNode","favicon","createFaviconAsNode","undefined","serverDocumentData","metadata","filter","Boolean","bodyNodes","ReactDOMServer","renderToReadableStream","ServerDocument","Head","Provider","InnerRoot","progressiveChunkSize","bootstrapScriptContent","getBootstrapContents","hydrate","bootstrapScripts","js","signal","request","onError","error","aborted","console"],"mappings":"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"}
1
+ {"version":3,"sources":["server/renderStreamingContent.tsx"],"sourcesContent":[null],"names":["getStreamingContent","resolveMetadata","debug","createDebug","resetReactNavigationContexts","contexts","globalThis","Map","prepareRenderContext","location","options","headContext","Root","getRootComponent","element","getStyleElement","registerStaticRootComponent","ExpoRoot","context","ctx","wrapper","children","div","id","loaderKey","loader","key","search","loadedData","data","FontResources","descriptors","Font","getServerResourceDescriptors","length","createInjectedFontsAsNodes","withServerContext","headNodes","headCssNodes","createInjectedCssAsNodes","assets","css","externalCssNodes","createInjectedExternalCssAsNodes","externalCss","inlineCssNodes","createInjectedInlineCssAsNodes","inlineCss","faviconNode","favicon","createFaviconAsNode","undefined","headJsNodes","bodyNodes","bodyJsNodes","createInjectedScriptAsNodes","js","serverDocumentData","metadata","filter","Boolean","ReactDOMServer","renderToReadableStream","ServerDocument","Head","Provider","InnerRoot","progressiveChunkSize","bootstrapScriptContent","getBootstrapContents","hydrate","signal","request","onError","error","aborted","console"],"mappings":"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"}
@@ -2,6 +2,5 @@ import type { RequireContext } from 'expo-router';
2
2
  export type GetTypedRoutesDeclarationFileOptions = {
3
3
  partialTypedGroups?: boolean;
4
4
  testIgnoreComments?: boolean;
5
- unstable_useServerMiddleware?: boolean;
6
5
  };
7
- export declare function getTypedRoutesDeclarationFile(ctx: RequireContext, { partialTypedGroups, testIgnoreComments, unstable_useServerMiddleware, }?: GetTypedRoutesDeclarationFileOptions): string;
6
+ export declare function getTypedRoutesDeclarationFile(ctx: RequireContext, { partialTypedGroups, testIgnoreComments, }?: GetTypedRoutesDeclarationFileOptions): string;
@@ -22,7 +22,7 @@ const SLUG = /\[.+?\]/g;
22
22
  // /(group)/path/(group2)/route - Match [(group), (group2)]
23
23
  const GROUP = /(?:^|\/)\(.*?\)/g;
24
24
  const urlParams = "${`?${string}` | `#${string}` | ''}";
25
- function getTypedRoutesDeclarationFile(ctx, { partialTypedGroups = false, testIgnoreComments = false, unstable_useServerMiddleware = false } = {}) {
25
+ function getTypedRoutesDeclarationFile(ctx, { partialTypedGroups = false, testIgnoreComments = false } = {}) {
26
26
  let routeNode = null;
27
27
  try {
28
28
  routeNode = (0, _routing().getRoutes)(ctx, {
@@ -33,9 +33,7 @@ function getTypedRoutesDeclarationFile(ctx, { partialTypedGroups = false, testIg
33
33
  notFound: false,
34
34
  ignoreEntryPoints: true,
35
35
  ignoreRequireErrors: true,
36
- importMode: 'async',
37
- // NOTE(@hassankhan): We should ensure that getRoutes() doesn't have optional options in the future
38
- unstable_useServerMiddleware
36
+ importMode: 'async'
39
37
  });
40
38
  } catch {
41
39
  // Ignore errors from `getRoutes`. This is also called inside the app, which has
@@ -1 +1 @@
1
- {"version":3,"sources":["typed-routes/generate.ts"],"sourcesContent":[null],"names":["getTypedRoutesDeclarationFile","CATCH_ALL","SLUG","GROUP","urlParams","ctx","partialTypedGroups","testIgnoreComments","unstable_useServerMiddleware","routeNode","getRoutes","ignore","platformRoutes","notFound","ignoreEntryPoints","ignoreRequireErrors","importMode","groupedNodes","groupRouteNodes","staticRoutesStrings","staticRouteInputObjects","staticRouteOutputObjects","type","static","push","contextKeyToType","dynamicRouteStrings","dynamicRouteInputObjects","dynamicRouteOutputObjects","dynamicRouteTemplate","paramsNames","dynamic","inputParams","map","param","key","startsWith","slice","value","contextKeyToProperty","join","outputParams","replaceAll","href","hrefInputParams","hrefOutputParams","tsExpectError","groupedContextKeys","Set","Map","route","child","children","routeKey","generated","removeSupportedExtensions","contextKey","replace","set","split","filter","segment","endsWith","add","test","JSON","stringify","match","typeWithGroups","groups","length","groupsAsType","group","typeWithoutGroups"],"mappings":";;;;+BAkBgBA;;;eAAAA;;;;yBAjBqD;;;;;;AAErE,oCAAoC;AACpC,MAAMC,YAAY;AAClB,6BAA6B;AAC7B,MAAMC,OAAO;AACb,2DAA2D;AAC3D,MAAMC,QAAQ;AAEd,MAAMC,YAAY;AAQX,SAASJ,8BACdK,GAAmB,EACnB,EACEC,qBAAqB,KAAK,EAC1BC,qBAAqB,KAAK,EAC1BC,+BAA+B,KAAK,EACC,GAAG,CAAC,CAAC;IAE5C,IAAIC,YAA8B;IAElC,IAAI;QACFA,YAAYC,IAAAA,oBAAS,EAACL,KAAK;YACzBM,QAAQ;gBAAC;aAAoB;YAC7BC,gBAAgB;YAChBC,UAAU;YACVC,mBAAmB;YACnBC,qBAAqB;YACrBC,YAAY;YACZ,mGAAmG;YACnGR;QACF;IACF,EAAE,OAAM;IACN,gFAAgF;IAChF,wCAAwC;IAC1C;IAEA,MAAMS,eAAeC,gBAAgBT;IACrC,MAAMU,sBAAgC;QAAC;QAA6B;KAA4B;IAChG,MAAMC,0BAAoC;QACxC;QACA;KACD;IACD,MAAMC,2BAAqC;QACzC;QACA;KACD;IAED,KAAK,MAAMC,QAAQL,aAAaM,MAAM,CAAE;QACtCJ,oBAAoBK,IAAI,CAACC,iBAAiBH,OAAOlB,WAAWE;QAC5Dc,wBAAwBI,IAAI,CAC1B,CAAC,YAAY,EAAEC,iBAAiBH,MAAMhB,oBAAoB,uCAAuC,CAAC;QAEpGe,yBAAyBG,IAAI,CAC3B,CAAC,YAAY,EAAEC,iBAAiBH,MAAMhB,oBAAoB,wCAAwC,CAAC;IAEvG;IAEA,MAAMoB,sBAAgC,EAAE;IACxC,MAAMC,2BAAqC,EAAE;IAC7C,MAAMC,4BAAsC,EAAE;IAE9C,KAAK,MAAM,CAACC,sBAAsBC,YAAY,IAAIb,aAAac,OAAO,CAAE;QACtE,MAAMC,cAAcF,YACjBG,GAAG,CAAC,CAACC;YACJ,MAAMC,MAAMD,MAAME,UAAU,CAAC,SAASF,MAAMG,KAAK,CAAC,KAAKH;YACvD,MAAMI,QAAQJ,MAAME,UAAU,CAAC,SAAS,wBAAwB;YAChE,OAAO,GAAGG,qBAAqBJ,KAAK,EAAE,EAAEG,MAAM,CAAC,CAAC;QAClD,GACCE,IAAI,CAAC;QAER,MAAMC,eAAeX,YAClBG,GAAG,CAAC,CAACC;YACJ,MAAMC,MAAMD,MAAME,UAAU,CAAC,SAASF,MAAMG,KAAK,CAAC,KAAKH;YACvD,MAAMI,QAAQJ,MAAME,UAAU,CAAC,SAAS,aAAa;YACrD,OAAO,GAAGG,qBAAqBJ,KAAK,EAAE,EAAEG,MAAM,CAAC,CAAC;QAClD,GACCE,IAAI,CAAC;QAERd,oBAAoBF,IAAI,CACtBC,iBACEI,qBACGa,UAAU,CAACzC,WAAW,aACtByC,UAAU,CAACxC,MAAM,kCAAkCE,WACtDE;QAIJqB,yBAAyBH,IAAI,CAC3B,CAAC,YAAY,EAAEC,iBAAiBI,sBAAsBvB,oBAAoB,wCAAwC,EAAE0B,YAAY,IAAI,CAAC;QAEvIJ,0BAA0BJ,IAAI,CAC5B,CAAC,YAAY,EAAEC,iBAAiBI,sBAAsBvB,oBAAoB,yCAAyC,EAAEmC,aAAa,IAAI,CAAC;IAE3I;IAEA,MAAME,OAAO;WACRxB;WACAC;WACAM;WACAC;KACJ,CAACa,IAAI,CAAC;IAEP,MAAMI,kBAAkB;WAAIxB;WAA4BO;KAAyB,CAACa,IAAI,CAAC;IACvF,MAAMK,mBAAmB;WAAIxB;WAA6BO;KAA0B,CAACY,IAAI,CAAC;IAE1F,MAAMM,gBAAgBvC,qBAClB,wIACA;IAEJ,OAAO,CAAC;;;;;;;;MAQJ,EAAEuC,cAAc,iBAAiB,EAAEF,gBAAgB;MACnD,EAAEE,cAAc,kBAAkB,EAAED,iBAAiB;MACrD,EAAEC,cAAc,MAAM,EAAEH,KAAK;;;;AAInC,CAAC;AACD;AAEA,SAASzB,gBACPT,SAA2B,EAC3BsC,qBAAqB;IACnBxB,QAAQ,IAAIyB;IACZjB,SAAS,IAAIkB;AACf,CAAC;IAED,IAAI,CAACxC,WAAW;QACd,OAAOsC;IACT;IAEA,uBAAuB;IACvB,IAAItC,UAAUa,IAAI,KAAK,SAAS;QAC9B,yBAAyB;QACzB,IAAIb,UAAUyC,KAAK,KAAK,IAAI;YAC1B,KAAK,MAAMC,SAAS1C,UAAU2C,QAAQ,CAAE;gBACtClC,gBAAgBiC,OAAOJ;YACzB;YACA,OAAOA;QACT;QAEA,OAAOA;IACT;IAEA,IAAIM;IAEJ,IAAI5C,UAAU6C,SAAS,EAAE;QACvB,yEAAyE;QACzE,8EAA8E;QAC9ED,WAAW5C,UAAUyC,KAAK;IAC5B,OAAO;QACLG,WAAWE,IAAAA,oCAAyB,EAAC9C,UAAU+C,UAAU,EACtDC,OAAO,CAAC,YAAY,IAAI,6BAA6B;SACrDA,OAAO,CAAC,OAAO,KAAK,uBAAuB;IAChD;IAEAJ,aAAa,KAAK,4DAA4D;IAE9E,IAAI,CAACA,SAASjB,UAAU,CAAC,MAAM;QAC7B,mDAAmD;QACnDiB,WAAW,CAAC,CAAC,EAAEA,UAAU;IAC3B;IAEAA,WAAWA,SAASI,OAAO,CAAC,OAAO;IAEnC,IAAIhD,UAAUsB,OAAO,EAAE;QACrBgB,mBAAmBhB,OAAO,CAAC2B,GAAG,CAC5BL,UACAA,SACGM,KAAK,CAAC,KACNC,MAAM,CAAC,CAACC;YACP,OAAOA,QAAQzB,UAAU,CAAC,QAAQyB,QAAQC,QAAQ,CAAC;QACrD,GACC7B,GAAG,CAAC,CAAC4B;YACJ,OAAOA,QAAQxB,KAAK,CAAC,GAAG,CAAC;QAC3B;IAEN,OAAO;QACLU,mBAAmBxB,MAAM,CAACwC,GAAG,CAACV;IAChC;IAEA,KAAK,MAAMF,SAAS1C,UAAU2C,QAAQ,CAAE;QACtClC,gBAAgBiC,OAAOJ;IACzB;IAEA,OAAOA;AACT;AAEA,SAASR,qBAAqBiB,UAAkB;IAC9C,OAAO,CAAC,iBAAiBQ,IAAI,CAACR,cAAcS,KAAKC,SAAS,CAACV,cAAcA;AAC3E;AAEA,SAAS/B,iBAAiB+B,UAAkB,EAAElD,kBAA2B;IACvE,IAAIkD,WAAWW,KAAK,CAAChE,WAAW,MAAM;QACpC,OAAO,CAAC,EAAE,EAAEqD,WAAW,EAAE,CAAC;IAC5B;IAEA,2DAA2D;IAC3D,MAAMY,iBAAiBZ,WAAWd,UAAU,CAACvC,OAAO,CAACgE;QACnD,MAAME,SAASF,MAAM9B,KAAK,CAAC,GAAG,CAAC,IAAI,0CAA0C;QAC7E,0EAA0E;QAC1E,IAAIgC,OAAOC,MAAM,GAAG,KAAKhE,oBAAoB;YAC3C,2CAA2C;YAC3C,MAAMiE,eAAeF,OAAOV,KAAK,CAAC,KAAK1B,GAAG,CAAC,CAACuC,QAAU,CAAC,GAAG,EAAEA,MAAM,EAAE,CAAC;YACrE,4CAA4C;YAC5C,IAAIlE,oBAAoB;gBACtBiE,aAAa/C,IAAI,CAAC;YACpB;YACA,gCAAgC;YAChC,OAAO,CAAC,GAAG,EAAE+C,aAAa/B,IAAI,CAAC,OAAO,CAAC,CAAC;QAC1C,OAAO;YACL,OAAO2B;QACT;IACF;IAEA,IAAIM,oBAAoBjB,WAAWd,UAAU,CAACvC,OAAO,OAAO;IAE5D;;;;GAIC,GACD,IAAIsE,kBAAkBrC,UAAU,CAAChC,YAAY;QAC3CqE,oBAAoB,CAAC,CAAC,EAAEA,mBAAmB;IAC7C;IAEA,OAAO,CAAC,EAAE,EAAEL,eAAe,OAAO,EAAEK,kBAAkB,EAAE,CAAC;AAC3D"}
1
+ {"version":3,"sources":["typed-routes/generate.ts"],"sourcesContent":[null],"names":["getTypedRoutesDeclarationFile","CATCH_ALL","SLUG","GROUP","urlParams","ctx","partialTypedGroups","testIgnoreComments","routeNode","getRoutes","ignore","platformRoutes","notFound","ignoreEntryPoints","ignoreRequireErrors","importMode","groupedNodes","groupRouteNodes","staticRoutesStrings","staticRouteInputObjects","staticRouteOutputObjects","type","static","push","contextKeyToType","dynamicRouteStrings","dynamicRouteInputObjects","dynamicRouteOutputObjects","dynamicRouteTemplate","paramsNames","dynamic","inputParams","map","param","key","startsWith","slice","value","contextKeyToProperty","join","outputParams","replaceAll","href","hrefInputParams","hrefOutputParams","tsExpectError","groupedContextKeys","Set","Map","route","child","children","routeKey","generated","removeSupportedExtensions","contextKey","replace","set","split","filter","segment","endsWith","add","test","JSON","stringify","match","typeWithGroups","groups","length","groupsAsType","group","typeWithoutGroups"],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@expo/router-server",
3
- "version": "58.0.0",
3
+ "version": "58.0.2",
4
4
  "description": "Expo Router is a file-based router for React Native and web applications.",
5
5
  "keywords": [
6
6
  "expo",
@@ -38,14 +38,15 @@
38
38
  "@typescript/vfs": "^1.6.4",
39
39
  "expect-type": "^1.3.0",
40
40
  "expo-module-scripts": "56.0.3",
41
- "expo-router": "58.0.0",
41
+ "expo-router": "58.0.3",
42
+ "node-html-parser": "^6.1.5",
42
43
  "react-server-dom-webpack": "~19.0.8"
43
44
  },
44
45
  "peerDependencies": {
45
- "@expo/metro-runtime": "^58.0.0",
46
+ "@expo/metro-runtime": "^58.0.2",
46
47
  "expo": "*",
47
- "expo-constants": "^58.0.0",
48
- "expo-font": "^58.0.0",
48
+ "expo-constants": "^58.0.2",
49
+ "expo-font": "^58.0.1",
49
50
  "expo-router": "*",
50
51
  "expo-server": "^58.0.0",
51
52
  "react": "*",
@@ -66,7 +67,7 @@
66
67
  "optional": true
67
68
  }
68
69
  },
69
- "gitHead": "c543a7181fc32e14f42d89550087b80ac5c490f2",
70
+ "gitHead": "313e67f5c9dfb16f9deca74a271cd1d4f33a6f82",
70
71
  "scripts": {
71
72
  "build": "expo-build cjs:src",
72
73
  "clean": "expo-module clean",