mod_alias is a built-in module, so let's just make it initialized by default

Author: birdofpreyru

CMakeLists.txt

@@ -123,16 +123,13 @@ set(PKG_CONFIG_ARGN --libs-only-l)
 add_subdirectory(lighttpd1.4)
 
 set(PLUGIN_STATIC
+  PLUGIN_INIT(mod_alias)\n
   PLUGIN_INIT(mod_dirlisting)\n
   PLUGIN_INIT(mod_h2)\n
   PLUGIN_INIT(mod_indexfile)\n
   PLUGIN_INIT(mod_staticfile)\n
 )
 
-if(WITH_MOD_ALIAS)
-  set(PLUGIN_STATIC "${PLUGIN_STATIC}PLUGIN_INIT(mod_alias)\n")
-endif()
-
 if(WITH_MOD_WEBDAV)
   set(PLUGIN_STATIC "${PLUGIN_STATIC}PLUGIN_INIT(mod_webdav)\n")
 endif()

README.md

@@ -345,36 +345,16 @@ outside platform-specific sub-folders.
 ### Enabling Alias Module
 [Enabling Alias module]: #enabling-alias-module
 
-[Lighttpd]'s optional module [mod_alias] is used to specify a special document
-root for a given url-subset. To enable it:
+[Lighttpd] module [mod_alias] is used to specify a special document
+root for a given url-subset. To enable it just use `extraConfig` option of
+[Server] [constructor()] to load and configure it, for example:
 
-1.  **Android**: Edit `android/gradle.properties` file of your app, adding
-    this flag:
-    ```gradle
-    ReactNativeStaticServer_alias = true
-    ```
-
-    **iOS**: Use environment variable `RN_STATIC_SERVER_ALIAS=1` when
-    installing or updating the pods (_i.e._ when doing `pod install` or
-    `pod update`).
-
-    **macOS (Catalyst)**: The same as for iOS.
-
-    **Windows**: Does not require a special setup — the pre-compiled DLL
-    for [mod_alias] is always packed with the library, and loaded if opted
-    by [Server]'s [constructor()].
-
-2.  Use `extraConfig` option of [Server] [constructor()] to load and configure
-    [mod_alias], for example:
-    ```ts
-    extraConfig: `
-      server.modules += ("mod_alias")
-      alias.url = ("/sample/url" => "/special/root/path")
-    `,
-    ```
-    With this configuration incoming request `GET /sample/url/file` will be
-    routed to the `/special/root/path/file`, rather than the `FILE_DIR/sample/url/file`,
-    where `FILE_DIR` is the value you provided to the [Server]'s `fileDir` option.
+```ts
+  extraConfig: `
+    server.modules += ("mod_alias")
+    alias.url = ("/sample/url" => "/special/root/path")
+  `,
+```
 
 ### Enabling WebDAV Module
 [Enabling WebDAV module]: #enabling-webdav-module

android/build.gradle

@@ -43,7 +43,6 @@ android {
           // TODO: I guess, there should be a more elegant way to append
           // arguments here based on flags set in project Gradle properties,
           // but for now this will do.
-          (project.properties["ReactNativeStaticServer_alias"] ? "-DWITH_MOD_ALIAS=ON" : "-DWITH_MOD_ALIAS=OFF"),
           (project.properties["ReactNativeStaticServer_webdav"] ? "-DWITH_MOD_WEBDAV=ON" : "-DWITH_MOD_WEBDAV=OFF")
         targets "lighttpd"
       }

dr-pogodin-react-native-static-server.podspec

@@ -32,12 +32,6 @@ $outputFiles = [
   '${BUILT_PRODUCTS_DIR}/libpcre2-8.a'
 ]
 
-if ENV['RN_STATIC_SERVER_ALIAS'] == '1' then
-  $extraCMakeArgs += " -DWITH_MOD_ALIAS=ON"
-  $libToolFlags += " -lmod_alias"
-  $outputFiles.append('${BUILD_PRODUCTS_DIR}/libmod_alias.a')
-end
-
 if ENV['RN_STATIC_SERVER_WEBDAV'] == '1' then
   $extraCMakeArgs += " -DWITH_MOD_WEBDAV=ON"
   $libToolFlags += " -lmod_webdav"

example/README.md

@@ -29,7 +29,7 @@ to prepare and run the example:
   - `npm run android`
 - On **iOS**:
   - ```sh
-    cd ios && RCT_NEW_ARCH_ENABLED=1 RN_STATIC_SERVER_ALIAS=1 pod install
+    cd ios && RCT_NEW_ARCH_ENABLED=1 pod install
     ```
     Here `RCT_NEW_ARCH_ENABLED=1` is optional, omit it to build for the old RN
     architecture.

example/android/gradle.properties

@@ -43,5 +43,4 @@ newArchEnabled=true
 # If set to false, you will be using JSC instead.
 hermesEnabled=true
 
-ReactNativeStaticServer_alias = true
 ReactNativeStaticServer_webdav = true

example/ios/Podfile.lock

@@ -1290,7 +1290,7 @@ SPEC CHECKSUMS:
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   dr-pogodin-react-native-fs: 3ccf8b867c5feeae20dd41e05d7fde2c07f2119f
-  dr-pogodin-react-native-static-server: 55cbfca2b833f06ef1189f2256d3a5f1ceec5de3
+  dr-pogodin-react-native-static-server: 68f837a0534dbe71869852c8296398bbf9d9ebbc
   FBLazyVector: 71803c074f6325f10b5ec891c443b6bbabef0ca7
   Flipper: 6edb735e6c3e332975d1b17956bcc584eccf5818
   Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c