expo-router 58.0.3 → 58.0.4

package/android/build.gradle

@@ -4,13 +4,13 @@ plugins {
 }
 
 group = 'expo.modules.router'
-version = '58.0.3'
+version = '58.0.4'
 
 android {
   namespace "expo.modules.router"
   defaultConfig {
     versionCode 1
-    versionName "58.0.3"
+    versionName "58.0.4"
   }
   lintOptions {
     abortOnError false

package/android/src/main/java/expo/modules/router/ExpoRouterModule.kt

@@ -0,0 +1,134 @@
+package expo.modules.router
+
+import android.content.Context
+import android.content.res.Configuration
+import android.graphics.Color
+import expo.modules.kotlin.exception.Exceptions
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+import androidx.appcompat.view.ContextThemeWrapper
+import com.google.android.material.color.MaterialColors
+
+class ExpoRouterModule : Module() {
+  private val context: Context
+    get() = appContext.reactContext ?: throw Exceptions.ReactContextLost()
+
+  override fun definition() = ModuleDefinition {
+    Name("ExpoRouter")
+
+    Function("Material3Color") { name: String, scheme: String ->
+      materialColor(name, scheme)
+    }
+
+    Function("Material3DynamicColor") { name: String, scheme: String ->
+      dynamicColor(name, scheme)
+    }
+  }
+
+  private fun materialColor(name: String, scheme: String): String? {
+    val scheme = if (scheme != "dark" && scheme != "light") {
+      getSystemScheme()
+    } else {
+      scheme
+    }
+
+    val theme = if (scheme == "dark") {
+      com.google.android.material.R.style.Theme_Material3_Dark
+    } else {
+      com.google.android.material.R.style.Theme_Material3_Light
+    }
+
+    return getColorFromTheme(name, theme)
+  }
+
+  private fun dynamicColor(name: String, scheme: String): String? {
+    val scheme = if (scheme != "dark" && scheme != "light") {
+      getSystemScheme()
+    } else {
+      scheme
+    }
+
+    val theme = if (scheme == "dark") {
+      com.google.android.material.R.style.Theme_Material3_DynamicColors_Dark
+    } else {
+      com.google.android.material.R.style.Theme_Material3_DynamicColors_Light
+    }
+
+    return getColorFromTheme(name, theme)
+  }
+
+  private fun getColorFromTheme(name: String, themeResId: Int): String? {
+    val wrappedContext = ContextThemeWrapper(context, themeResId)
+    val attr = attrMap[name.lowercase()]
+      ?: return null
+
+    return MaterialColors.getColorOrNull(wrappedContext, attr)?.let { colorToHex(it) }
+  }
+
+  private fun getSystemScheme(): String {
+    val currentNightMode =
+      context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
+    return when (currentNightMode) {
+      Configuration.UI_MODE_NIGHT_YES -> "dark"
+      Configuration.UI_MODE_NIGHT_NO -> "light"
+      else -> "light"
+    }
+  }
+
+  companion object {
+    fun colorToHex(color: Int): String {
+      return String.format("#%02x%02x%02x", Color.red(color), Color.green(color), Color.blue(color))
+    }
+
+    val attrMap = mapOf(
+      // Some of the colors are androidx.appcompat.*
+      // https://github.com/material-components/material-components-android/issues/4709
+      "primary" to androidx.appcompat.R.attr.colorPrimary,
+      "onprimary" to com.google.android.material.R.attr.colorOnPrimary,
+      "primarycontainer" to com.google.android.material.R.attr.colorPrimaryContainer,
+      "onprimarycontainer" to com.google.android.material.R.attr.colorOnPrimaryContainer,
+      "primaryinverse" to com.google.android.material.R.attr.colorPrimaryInverse,
+      "primaryfixed" to com.google.android.material.R.attr.colorPrimaryFixed,
+      "primaryfixeddim" to com.google.android.material.R.attr.colorPrimaryFixedDim,
+      "onprimaryfixed" to com.google.android.material.R.attr.colorOnPrimaryFixed,
+      "onprimaryfixedvariant" to com.google.android.material.R.attr.colorOnPrimaryFixedVariant,
+      "secondary" to com.google.android.material.R.attr.colorSecondary,
+      "onsecondary" to com.google.android.material.R.attr.colorOnSecondary,
+      "secondarycontainer" to com.google.android.material.R.attr.colorSecondaryContainer,
+      "onsecondarycontainer" to com.google.android.material.R.attr.colorOnSecondaryContainer,
+      "secondaryfixed" to com.google.android.material.R.attr.colorSecondaryFixed,
+      "secondaryfixeddim" to com.google.android.material.R.attr.colorSecondaryFixedDim,
+      "onsecondaryfixed" to com.google.android.material.R.attr.colorOnSecondaryFixed,
+      "onsecondaryfixedvariant" to com.google.android.material.R.attr.colorOnSecondaryFixedVariant,
+      "tertiary" to com.google.android.material.R.attr.colorTertiary,
+      "ontertiary" to com.google.android.material.R.attr.colorOnTertiary,
+      "tertiarycontainer" to com.google.android.material.R.attr.colorTertiaryContainer,
+      "ontertiarycontainer" to com.google.android.material.R.attr.colorOnTertiaryContainer,
+      "tertiaryfixed" to com.google.android.material.R.attr.colorTertiaryFixed,
+      "tertiaryfixeddim" to com.google.android.material.R.attr.colorTertiaryFixedDim,
+      "ontertiaryfixed" to com.google.android.material.R.attr.colorOnTertiaryFixed,
+      "ontertiaryfixedvariant" to com.google.android.material.R.attr.colorOnTertiaryFixedVariant,
+      "error" to androidx.appcompat.R.attr.colorError,
+      "onerror" to com.google.android.material.R.attr.colorOnError,
+      "errorcontainer" to com.google.android.material.R.attr.colorErrorContainer,
+      "onerrorcontainer" to com.google.android.material.R.attr.colorOnErrorContainer,
+      "outline" to com.google.android.material.R.attr.colorOutline,
+      "outlinevariant" to com.google.android.material.R.attr.colorOutlineVariant,
+      "background" to android.R.attr.colorBackground,
+      "onbackground" to com.google.android.material.R.attr.colorOnBackground,
+      "surface" to com.google.android.material.R.attr.colorSurface,
+      "onsurface" to com.google.android.material.R.attr.colorOnSurface,
+      "surfacevariant" to com.google.android.material.R.attr.colorSurfaceVariant,
+      "onsurfacevariant" to com.google.android.material.R.attr.colorOnSurfaceVariant,
+      "surfaceinverse" to com.google.android.material.R.attr.colorSurfaceInverse,
+      "onsurfaceinverse" to com.google.android.material.R.attr.colorOnSurfaceInverse,
+      "surfacebright" to com.google.android.material.R.attr.colorSurfaceBright,
+      "surfacedim" to com.google.android.material.R.attr.colorSurfaceDim,
+      "surfacecontainer" to com.google.android.material.R.attr.colorSurfaceContainer,
+      "surfacecontainerlow" to com.google.android.material.R.attr.colorSurfaceContainerLow,
+      "surfacecontainerlowest" to com.google.android.material.R.attr.colorSurfaceContainerLowest,
+      "surfacecontainerhigh" to com.google.android.material.R.attr.colorSurfaceContainerHigh,
+      "surfacecontainerhighest" to com.google.android.material.R.attr.colorSurfaceContainerHighest
+    )
+  }
+}

package/expo-module.config.json

@@ -13,7 +13,7 @@
     "publication": {
       "groupId": "expo.modules.router",
       "artifactId": "expo.modules.router",
-      "version": "58.0.3",
+      "version": "58.0.4",
       "repository": "local-maven-repo"
     }
   }

package/{android/build/publications/release/module.json → local-maven-repo/expo/modules/router/expo.modules.router/58.0.4/expo.modules.router-58.0.4.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "expo.modules.router",
     "module": "expo.modules.router",
-    "version": "58.0.3",
+    "version": "58.0.4",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -24,8 +24,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.router-58.0.3.aar",
-          "url": "expo.modules.router-58.0.3.aar",
+          "name": "expo.modules.router-58.0.4.aar",
+          "url": "expo.modules.router-58.0.4.aar",
           "size": 16133,
           "sha512": "32ccb33ae7df2d0abc96fb77d87c776773a15d8de0818d83bbca865581f60f85a0c280a75de2f770590ccabadb78874cec32689a50a0bc29b6a9025ed6c592b1",
           "sha256": "5a620cdcb41c5bc3c82e954ffd02de6b85954cd41bde5b5694ac9d5f5f25aa8f",
@@ -74,8 +74,8 @@
       ],
       "files": [
         {
-          "name": "expo.modules.router-58.0.3.aar",
-          "url": "expo.modules.router-58.0.3.aar",
+          "name": "expo.modules.router-58.0.4.aar",
+          "url": "expo.modules.router-58.0.4.aar",
           "size": 16133,
           "sha512": "32ccb33ae7df2d0abc96fb77d87c776773a15d8de0818d83bbca865581f60f85a0c280a75de2f770590ccabadb78874cec32689a50a0bc29b6a9025ed6c592b1",
           "sha256": "5a620cdcb41c5bc3c82e954ffd02de6b85954cd41bde5b5694ac9d5f5f25aa8f",
@@ -94,8 +94,8 @@
       },
       "files": [
         {
-          "name": "expo.modules.router-58.0.3-sources.jar",
-          "url": "expo.modules.router-58.0.3-sources.jar",
+          "name": "expo.modules.router-58.0.4-sources.jar",
+          "url": "expo.modules.router-58.0.4-sources.jar",
           "size": 1986,
           "sha512": "c1d7dd32034c271b8e8d511c2e8ea7705b8378c4e2859d4bf810cd75ea33bbd4c212c9bbb5f0d27ae90f8f599fbb8f865b37001791bb539e94b90413396e6139",
           "sha256": "3027e02be198959073884cd5afb9b46f39f0d7396a590f6840bb63ef37010adc",

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.4/expo.modules.router-58.0.4.module.md5

@@ -0,0 +1 @@
+e84056927018e771c5156629ddf33a76

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.4/expo.modules.router-58.0.4.module.sha1

@@ -0,0 +1 @@
+36a2135bc13c24eed3e6ff45ffd674f64e7d8415

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.4/expo.modules.router-58.0.4.module.sha256

@@ -0,0 +1 @@
+360156f6b142925851bdcb9ecf53ff2dcadfd4e1e3bfc6baf520b85476f9c037

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.4/expo.modules.router-58.0.4.module.sha512

@@ -0,0 +1 @@
+abf544811791f013cb517b113df6f5d2daa30122294e99e48403d576bf2fdebe87ecee4438ad620d0274d1389cfb414770ce1ee181da96e8279517ada0223d65

package/{android/build/publications/release/pom-default.xml → local-maven-repo/expo/modules/router/expo.modules.router/58.0.4/expo.modules.router-58.0.4.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>expo.modules.router</groupId>
   <artifactId>expo.modules.router</artifactId>
-  <version>58.0.3</version>
+  <version>58.0.4</version>
   <packaging>aar</packaging>
   <name>expo.modules.router</name>
   <url>https://github.com/expo/expo</url>

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.4/expo.modules.router-58.0.4.pom.md5

@@ -0,0 +1 @@
+d8448fd342f59ad68d7999c330f1f643

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.4/expo.modules.router-58.0.4.pom.sha1

@@ -0,0 +1 @@
+ee9e0fb0ee6f9333cf73690edc00d97ceb0a14ad

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.4/expo.modules.router-58.0.4.pom.sha256

@@ -0,0 +1 @@
+1a1483ba6afaa71ae4609ba65fcdb5abb20e4f84776063e9f5b19d9b4a0a79de

package/local-maven-repo/expo/modules/router/expo.modules.router/58.0.4/expo.modules.router-58.0.4.pom.sha512

@@ -0,0 +1 @@
+4b6d2f1b5bb79480c2dac17129a3ecbe00514f455d64d6bc269a7f03e0ff787b784400ac02dabd73a943580c6534b3e7386b3b1899c18443051fc135f382b210

package/local-maven-repo/expo/modules/router/expo.modules.router/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>expo.modules.router</groupId>
   <artifactId>expo.modules.router</artifactId>
   <versioning>
-    <latest>58.0.3</latest>
-    <release>58.0.3</release>
+    <latest>58.0.4</latest>
+    <release>58.0.4</release>
     <versions>
-      <version>58.0.3</version>
+      <version>58.0.4</version>
     </versions>
-    <lastUpdated>20260915202021</lastUpdated>
+    <lastUpdated>20260916230014</lastUpdated>
   </versioning>
 </metadata>

package/local-maven-repo/expo/modules/router/expo.modules.router/maven-metadata.xml.md5

@@ -1 +1 @@
-b85d1f9d3471bd2f8d32e0a23f328c6e
+9738245bd0d34cbbc3935edb58237bbf

package/local-maven-repo/expo/modules/router/expo.modules.router/maven-metadata.xml.sha1

@@ -1 +1 @@
-1835cab4fbe734f206727555def133ae6f7dc022
+76a51919a8bf9ffd6ef1a0bda9b6c272b15f30bb

package/local-maven-repo/expo/modules/router/expo.modules.router/maven-metadata.xml.sha256

@@ -1 +1 @@
-d001eb8214dae276b16a57c04e8f96976a1390ae3724430ea29b548b9524b3d4
+a6c47c922656db6b78d125e403ece7fd161b5cea2c3115bdc63b5a13ee8ce1c2

package/local-maven-repo/expo/modules/router/expo.modules.router/maven-metadata.xml.sha512

@@ -1 +1 @@
-30af61047daf66876fa2d4d4224c2c0be942fa784a19d1ffc86ab34d2cfe993c9e188534d7c8bd96fa3bffbe42132119f765e6ea92c1371108ae76b7e8428cd7
+ceb75026c3e03d1957f39f65c40e1d9527d174a873f290299c005438087a87e7bb6ae20fb5106b847df179e9ea684884a7396210c227430d3e9df37c4b3b5b26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-router",
-  "version": "58.0.3",
+  "version": "58.0.4",
   "description": "Expo Router is a file-based router for React Native and web applications.",
   "keywords": [
     "expo",
@@ -20,12 +20,13 @@
   "files": [
     "link",
     "android",
+    "!android/.gitignore",
+    "!android/build/**",
     "local-maven-repo",
     "assets",
     "build",
     "internal",
     "vendor",
-    "!src",
     "_ctx-html.js",
     "_ctx-shared.js",
     "_ctx.*",
@@ -273,8 +274,8 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@expo/log-box": "^58.0.2",
-    "@expo/metro-runtime": "^58.0.2",
+    "@expo/log-box": "^58.0.3",
+    "@expo/metro-runtime": "^58.0.3",
     "@expo/schema-utils": "^58.0.0",
     "@radix-ui/react-slot": "^1.2.0",
     "@radix-ui/react-tabs": "^1.1.12",
@@ -294,7 +295,7 @@
     "standard-navigation": "^0.0.5"
   },
   "devDependencies": {
-    "@expo/ui": "^58.0.2",
+    "@expo/ui": "^58.0.3",
     "@jest/globals": "^29.7.0",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.9.1",
@@ -321,13 +322,13 @@
     "react-server-dom-webpack": "~19.0.8"
   },
   "peerDependencies": {
-    "@expo/log-box": "^58.0.2",
-    "@expo/metro-runtime": "^58.0.2",
-    "@expo/ui": "^58.0.2",
+    "@expo/log-box": "^58.0.3",
+    "@expo/metro-runtime": "^58.0.3",
+    "@expo/ui": "^58.0.3",
     "@testing-library/react-native": ">= 13.2.0",
     "expo": "*",
-    "expo-constants": "^58.0.2",
-    "expo-linking": "^58.0.2",
+    "expo-constants": "^58.0.3",
+    "expo-linking": "^58.0.3",
     "expo-symbols": "^58.0.1",
     "react": "*",
     "react-dom": "*",
@@ -369,7 +370,7 @@
       "optional": true
     }
   },
-  "gitHead": "313e67f5c9dfb16f9deca74a271cd1d4f33a6f82",
+  "gitHead": "917a61b581baeb852aa4fe331da2c1395d824351",
   "scripts": {
     "build": "pnpm run build:lib && pnpm run build:plugin",
     "build:lib": "expo-build cjs:src",

package/plugin/build/withRouter.d.ts

@@ -53,14 +53,22 @@ export type Props = {
     headers?: Record<string, string | string[]>;
     /** A list of headers that are set on a specific path's response from the server. */
     pageHeaders?: PageHeadersConfig[];
+    /** Enable API routes with static or server output. Defaults to `true` for server output and `false` for static output. */
+    apiRoutes?: boolean;
     /**
      * (Deprecated) Enable experimental server middleware support. Middleware no longer requires an opt-in as of SDK 58.
      * @deprecated
      */
     unstable_useServerMiddleware?: boolean;
-    /** Enable experimental data loader support. Requires `web.output: 'static' | 'server'` to be set in app config. */
+    /**
+     * Data loaders no longer require an opt-in as of SDK 58. This option has no effect.
+     * @deprecated
+     */
     unstable_useServerDataLoaders?: boolean;
-    /** Enable experimental server-side rendering. When enabled with `web.output: 'server'`, HTML is rendered at request time instead of being pre-rendered at build time. */
+    /**
+     * Server rendering no longer requires an opt-in as of SDK 58. This option has no effect.
+     * @deprecated
+     */
     unstable_useServerRendering?: boolean;
     /** Disable synchronous layout updates for native screens. */
     disableSynchronousScreensUpdates?: boolean;

package/plugin/build/withRouter.js

@@ -61,7 +61,19 @@ const withRouter = (config, _props)=>{
     if (Object.hasOwn(props, 'unstable_useServerMiddleware')) {
         warnOnce('`unstable_useServerMiddleware` in the `expo-router` config plugin is deprecated as of SDK 58 and has no effect. Remove it from your app config.');
     }
+    if (Object.hasOwn(props, 'unstable_useServerDataLoaders')) {
+        warnOnce('`unstable_useServerDataLoaders` in the `expo-router` config plugin is deprecated as of SDK 58 and has no effect. Remove it from your app config.');
+    }
+    if (Object.hasOwn(props, 'unstable_useServerRendering')) {
+        warnOnce('`unstable_useServerRendering` in the `expo-router` config plugin is deprecated as of SDK 58 and has no effect. Remove it from your app config.');
+    }
     (0, _schemautils().validate)(schema, props);
+    if (props.apiRoutes === true && ![
+        'static',
+        'server'
+    ].includes(config.web?.output ?? '')) {
+        throw new Error('The `apiRoutes` option requires `web.output` to be set to `static` or `server`.');
+    }
     withExpoHeadIos(config);
     withGammaScreens(config);
     return {

package/plugin/build/withRouter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["withRouter.ts"],"sourcesContent":[null],"names":["schema","require","withExpoHeadIos","config","withInfoPlist","Array","isArray","modResults","NSUserActivityTypes","activityType","includes","push","withGammaScreens","withPodfile","contents","withRouter","_props","props","Object","hasOwn","warnOnce","validate","extra","router","warnMap","message","console","warn","styleText","stream","process","stderr"],"mappings":";;;;+BAiJA;;;eAAA;;;;yBAjJyB;;;;;;;yBACgC;;;;;;;yBAC/B;;;;;;AAE1B,MAAMA,SAASC,QAAQ;AAEvB,MAAMC,kBAAgC,CAACC;IACrC,OAAOC,IAAAA,8BAAa,EAACD,QAAQ,CAACA;QAC5B,oCAAoC;QACpC,sDAAsD;QAEtD,gDAAgD;QAChD,IAAI,CAACE,MAAMC,OAAO,CAACH,OAAOI,UAAU,CAACC,mBAAmB,GAAG;YACzDL,OAAOI,UAAU,CAACC,mBAAmB,GAAG,EAAE;QAC5C;QACA,uEAAuE;QACvE,4FAA4F;QAC5F,oCAAoC;QACpC,MAAMC,eAAe;QACrB,IAAI,CAACN,OAAOI,UAAU,CAACC,mBAAmB,CAACE,QAAQ,CAACD,eAAe;YACjEN,OAAOI,UAAU,CAACC,mBAAmB,CAACG,IAAI,CAACF;QAC7C;QACA,OAAON;IACT;AACF;AAEA,MAAMS,mBAAiC,CAACT;IACtC,OAAOU,IAAAA,4BAAW,EAACV,QAAQ,CAACA;QAC1B,IAAI,CAACA,OAAOI,UAAU,CAACO,QAAQ,CAACJ,QAAQ,CAAC,sBAAsB;YAC7DP,OAAOI,UAAU,CAACO,QAAQ,GAAG,CAAC,qHAAqH,EAAEX,OAAOI,UAAU,CAACO,QAAQ,EAAE;QACnL;QACA,OAAOX;IACT;AACF;AA8EA,MAAMY,aAAyC,CAACZ,QAAQa;IACtD,MAAMC,QAAQD,UAAU,CAAC;IAEzB,IAAIE,OAAOC,MAAM,CAACF,OAAO,iCAAiC;QACxDG,SACE;IAEJ;IAEAC,IAAAA,uBAAQ,EAACrB,QAAQiB;IAEjBf,gBAAgBC;IAChBS,iBAAiBT;IAEjB,OAAO;QACL,GAAGA,MAAM;QACTmB,OAAO;YACL,GAAGnB,OAAOmB,KAAK;YACfC,QAAQ;gBACN,GAAGpB,OAAOmB,KAAK,EAAEC,MAAM;gBACvB,GAAGN,KAAK;YACV;QACF;IACF;AACF;AAEA,MAAMO,UAAmC,CAAC;AAC1C,SAASJ,SAASK,OAAe;IAC/B,IAAI,CAACD,OAAO,CAACC,QAAQ,EAAE;QACrBD,OAAO,CAACC,QAAQ,GAAG;QACnBC,QAAQC,IAAI,CAACC,IAAAA,qBAAS,EAAC,OAAOH,SAAS;YAAEI,QAAQC,QAAQC,MAAM;QAAC;IAClE;AACF;MAEA,WAAehB"}
+{"version":3,"sources":["withRouter.ts"],"sourcesContent":[null],"names":["schema","require","withExpoHeadIos","config","withInfoPlist","Array","isArray","modResults","NSUserActivityTypes","activityType","includes","push","withGammaScreens","withPodfile","contents","withRouter","_props","props","Object","hasOwn","warnOnce","validate","apiRoutes","web","output","Error","extra","router","warnMap","message","console","warn","styleText","stream","process","stderr"],"mappings":";;;;+BA2KA;;;eAAA;;;;yBA3KyB;;;;;;;yBACgC;;;;;;;yBAC/B;;;;;;AAE1B,MAAMA,SAASC,QAAQ;AAEvB,MAAMC,kBAAgC,CAACC;IACrC,OAAOC,IAAAA,8BAAa,EAACD,QAAQ,CAACA;QAC5B,oCAAoC;QACpC,sDAAsD;QAEtD,gDAAgD;QAChD,IAAI,CAACE,MAAMC,OAAO,CAACH,OAAOI,UAAU,CAACC,mBAAmB,GAAG;YACzDL,OAAOI,UAAU,CAACC,mBAAmB,GAAG,EAAE;QAC5C;QACA,uEAAuE;QACvE,4FAA4F;QAC5F,oCAAoC;QACpC,MAAMC,eAAe;QACrB,IAAI,CAACN,OAAOI,UAAU,CAACC,mBAAmB,CAACE,QAAQ,CAACD,eAAe;YACjEN,OAAOI,UAAU,CAACC,mBAAmB,CAACG,IAAI,CAACF;QAC7C;QACA,OAAON;IACT;AACF;AAEA,MAAMS,mBAAiC,CAACT;IACtC,OAAOU,IAAAA,4BAAW,EAACV,QAAQ,CAACA;QAC1B,IAAI,CAACA,OAAOI,UAAU,CAACO,QAAQ,CAACJ,QAAQ,CAAC,sBAAsB;YAC7DP,OAAOI,UAAU,CAACO,QAAQ,GAAG,CAAC,qHAAqH,EAAEX,OAAOI,UAAU,CAACO,QAAQ,EAAE;QACnL;QACA,OAAOX;IACT;AACF;AAsFA,MAAMY,aAAyC,CAACZ,QAAQa;IACtD,MAAMC,QAAQD,UAAU,CAAC;IAEzB,IAAIE,OAAOC,MAAM,CAACF,OAAO,iCAAiC;QACxDG,SACE;IAEJ;IAEA,IAAIF,OAAOC,MAAM,CAACF,OAAO,kCAAkC;QACzDG,SACE;IAEJ;IAEA,IAAIF,OAAOC,MAAM,CAACF,OAAO,gCAAgC;QACvDG,SACE;IAEJ;IAEAC,IAAAA,uBAAQ,EAACrB,QAAQiB;IAEjB,IAAIA,MAAMK,SAAS,KAAK,QAAQ,CAAC;QAAC;QAAU;KAAS,CAACZ,QAAQ,CAACP,OAAOoB,GAAG,EAAEC,UAAU,KAAK;QACxF,MAAM,IAAIC,MACR;IAEJ;IAEAvB,gBAAgBC;IAChBS,iBAAiBT;IAEjB,OAAO;QACL,GAAGA,MAAM;QACTuB,OAAO;YACL,GAAGvB,OAAOuB,KAAK;YACfC,QAAQ;gBACN,GAAGxB,OAAOuB,KAAK,EAAEC,MAAM;gBACvB,GAAGV,KAAK;YACV;QACF;IACF;AACF;AAEA,MAAMW,UAAmC,CAAC;AAC1C,SAASR,SAASS,OAAe;IAC/B,IAAI,CAACD,OAAO,CAACC,QAAQ,EAAE;QACrBD,OAAO,CAACC,QAAQ,GAAG;QACnBC,QAAQC,IAAI,CAACC,IAAAA,qBAAS,EAAC,OAAOH,SAAS;YAAEI,QAAQC,QAAQC,MAAM;QAAC;IAClE;AACF;MAEA,WAAepB"}

package/plugin/options.json

@@ -184,18 +184,22 @@
             }
           }
         },
+        "apiRoutes": {
+          "description": "Enable API routes with static or server output. Defaults to `true` for server output and `false` for static output.",
+          "type": "boolean"
+        },
         "unstable_useServerMiddleware": {
           "description": "Deprecated as of SDK 58. Server middleware no longer requires an opt-in; this option has no effect.",
           "type": "boolean",
           "default": false
         },
         "unstable_useServerDataLoaders": {
-          "description": "Enable experimental data loader support. Requires `web.output: 'static' | 'server'` to be set in app config.",
+          "description": "Deprecated as of SDK 58. Data loaders no longer require an opt-in; this option has no effect.",
           "type": "boolean",
           "default": false
         },
         "unstable_useServerRendering": {
-          "description": "Enable experimental server-side rendering. When enabled with `web.output: 'server'`, HTML is rendered at request time instead of being pre-rendered at build time.",
+          "description": "Deprecated as of SDK 58. Server rendering no longer requires an opt-in; this option has no effect.",
           "type": "boolean",
           "default": false
         },

package/plugin/src/__tests__/withRouter.test.ts

@@ -0,0 +1,25 @@
+import withRouter from '../withRouter';
+
+describe('apiRoutes', () => {
+  it.each(['static', 'server'] as const)('accepts API routes with %s output', (output) => {
+    const config = withRouter({ name: 'test', slug: 'test', web: { output } }, { apiRoutes: true });
+    expect(config.extra?.router.apiRoutes).toBe(true);
+  });
+
+  it.each(['single', undefined] as const)('rejects the setting with %s output', (output) => {
+    expect(() =>
+      withRouter({ name: 'test', slug: 'test', web: { output } }, { apiRoutes: true })
+    ).toThrow('The `apiRoutes` option requires `web.output` to be set to `static` or `server`.');
+  });
+
+  it.each(['static', 'server', 'single', undefined] as const)(
+    'preserves an explicit false value with %s output',
+    (output) => {
+      const config = withRouter(
+        { name: 'test', slug: 'test', web: { output } },
+        { apiRoutes: false }
+      );
+      expect(config.extra?.router.apiRoutes).toBe(false);
+    }
+  );
+});

package/plugin/src/index.ts

@@ -0,0 +1,3 @@
+import { Props } from './withRouter';
+
+export default (props: Props = {}): [string, Props] => ['expo-router', props];

package/plugin/src/withRouter.ts

@@ -0,0 +1,172 @@
+import { validate } from '@expo/schema-utils';
+import { ConfigPlugin, withInfoPlist, withPodfile } from 'expo/config-plugins';
+import { styleText } from 'node:util';
+
+const schema = require('../options.json');
+
+const withExpoHeadIos: ConfigPlugin = (config) => {
+  return withInfoPlist(config, (config) => {
+    // TODO: Add a way to enable this...
+    // config.modResults.CoreSpotlightContinuation = true;
+
+    // $(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route
+    if (!Array.isArray(config.modResults.NSUserActivityTypes)) {
+      config.modResults.NSUserActivityTypes = [];
+    }
+    // This ensures that stored `NSUserActivityType`s can be opened in-app.
+    // This is important for moving between native devices or from opening a link that was saved
+    // in a Quick Note or Siri Reminder.
+    const activityType = '$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route';
+    if (!config.modResults.NSUserActivityTypes.includes(activityType)) {
+      config.modResults.NSUserActivityTypes.push(activityType);
+    }
+    return config;
+  });
+};
+
+const withGammaScreens: ConfigPlugin = (config) => {
+  return withPodfile(config, (config) => {
+    if (!config.modResults.contents.includes('RNS_GAMMA_ENABLED')) {
+      config.modResults.contents = `# Set by expo-router. This enables Fabric-only features from react-native-screens\nENV['RNS_GAMMA_ENABLED'] ||= '1'\n${config.modResults.contents}`;
+    }
+    return config;
+  });
+};
+
+type AsyncRouteOption = 'development' | 'production' | boolean;
+
+type HttpMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'OPTIONS' | 'HEAD';
+
+type RedirectConfig = {
+  /** The previous file path that this route should redirect from */
+  source: string;
+  /** The target file path that this route should redirect to */
+  destination: string;
+  /** Whether the redirect is temporary or permanent. Defaults to `false`. */
+  permanent?: boolean;
+  /** HTTP methods that should be redirected. Omit to redirect all methods. */
+  methods?: HttpMethod[];
+};
+
+type RewriteConfig = {
+  /** The previous file path that should be rewritten */
+  source: string;
+  /** The target file path that this route should rewrite */
+  destination: string;
+  /** HTTP methods that should be rewritten. Omit to rewrite all methods. */
+  methods?: HttpMethod[];
+};
+
+type PageHeadersConfig = {
+  /** The path to match for the headers to apply. */
+  source: string;
+  /** Response headers to apply for matching paths. */
+  headers: Record<string, string | string[]>;
+};
+
+export type Props = {
+  /** Production origin URL where assets in the public folder are hosted. The fetch function is polyfilled to support relative requests from this origin in production, development origin is inferred using the Expo CLI development server. */
+  origin?: string | boolean;
+  /** A more specific origin URL used in the `expo-router/head` module for iOS handoff. Defaults to `origin`. */
+  headOrigin?: string;
+  /** Changes the routes directory from `app` to another value. Defaults to `app`. Avoid using this property. */
+  root?: string;
+  /** Enable or disable platform-specific routes. Defaults to `true`. */
+  platformRoutes?: boolean;
+  /** Enable or disable automatically generated routes. Defaults to `true`. */
+  sitemap?: boolean;
+  /** Should Async Routes be enabled. `production` is currently web-only and will be disabled on native. */
+  asyncRoutes?:
+    | AsyncRouteOption
+    | {
+        android?: AsyncRouteOption;
+        ios?: AsyncRouteOption;
+        web?: AsyncRouteOption;
+        default?: AsyncRouteOption;
+      };
+  /** Enable or disable partial route type generation. Defaults to `true`. */
+  partialRouteTypes?: boolean;
+  /** Enable static redirects. Defaults to `true`. */
+  redirects?: RedirectConfig[];
+  /** Enable static rewrites */
+  rewrites?: RewriteConfig[];
+  /** A list of headers that are set on every route response from the server */
+  headers?: Record<string, string | string[]>;
+  /** A list of headers that are set on a specific path's response from the server. */
+  pageHeaders?: PageHeadersConfig[];
+  /** Enable API routes with static or server output. Defaults to `true` for server output and `false` for static output. */
+  apiRoutes?: boolean;
+  /**
+   * (Deprecated) Enable experimental server middleware support. Middleware no longer requires an opt-in as of SDK 58.
+   * @deprecated
+   */
+  unstable_useServerMiddleware?: boolean;
+  /**
+   * Data loaders no longer require an opt-in as of SDK 58. This option has no effect.
+   * @deprecated
+   */
+  unstable_useServerDataLoaders?: boolean;
+  /**
+   * Server rendering no longer requires an opt-in as of SDK 58. This option has no effect.
+   * @deprecated
+   */
+  unstable_useServerRendering?: boolean;
+  /** Disable synchronous layout updates for native screens. */
+  disableSynchronousScreensUpdates?: boolean;
+  /** Rerender the app on color scheme changes. When enabled, the app tree will rerender when the system theme changes (light/dark mode). Defaults to `true`. */
+  adaptiveColors?: boolean;
+};
+
+const withRouter: ConfigPlugin<Props | void> = (config, _props) => {
+  const props = _props || {};
+
+  if (Object.hasOwn(props, 'unstable_useServerMiddleware')) {
+    warnOnce(
+      '`unstable_useServerMiddleware` in the `expo-router` config plugin is deprecated as of SDK 58 and has no effect. Remove it from your app config.'
+    );
+  }
+
+  if (Object.hasOwn(props, 'unstable_useServerDataLoaders')) {
+    warnOnce(
+      '`unstable_useServerDataLoaders` in the `expo-router` config plugin is deprecated as of SDK 58 and has no effect. Remove it from your app config.'
+    );
+  }
+
+  if (Object.hasOwn(props, 'unstable_useServerRendering')) {
+    warnOnce(
+      '`unstable_useServerRendering` in the `expo-router` config plugin is deprecated as of SDK 58 and has no effect. Remove it from your app config.'
+    );
+  }
+
+  validate(schema, props);
+
+  if (props.apiRoutes === true && !['static', 'server'].includes(config.web?.output ?? '')) {
+    throw new Error(
+      'The `apiRoutes` option requires `web.output` to be set to `static` or `server`.'
+    );
+  }
+
+  withExpoHeadIos(config);
+  withGammaScreens(config);
+
+  return {
+    ...config,
+    extra: {
+      ...config.extra,
+      router: {
+        ...config.extra?.router,
+        ...props,
+      },
+    },
+  };
+};
+
+const warnMap: Record<string, boolean> = {};
+function warnOnce(message: string) {
+  if (!warnMap[message]) {
+    warnMap[message] = true;
+    console.warn(styleText('red', message, { stream: process.stderr }));
+  }
+}
+
+export default withRouter;