Improved resolvePathRelativeToWwwroot support

TerriaJS · Aug 26, 2020 · f2aa63e · f2aa63e
1 parent 3d8dda3
commit f2aa63e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,9 @@
 ### Next version
 * [The next feature]
 
+### 3.3.1
+* Improved support with `resolvePathRelativeToWwwroot` triggering `serveWwwRoot`
+
 ### 3.3.0
 
 * Added option to configure post limit on `share` endpoint (see `shareMaxRequestSize` in `serverconfig.json.example`)

diff --git a/lib/makeserver.js b/lib/makeserver.js
@@ -101,7 +101,8 @@ module.exports = function(options) {
     }
 
     // Serve the bulk of our application as a static web directory.
-    var serveWwwRoot = exists(options.wwwroot + '/index.html');
+    var serveWwwRoot = exists(options.wwwroot + '/index.html')
+      || (options.settings.singlePageRouting && exists(options.wwwroot + options.settings.singlePageRouting.resolvePathRelativeToWwwroot));
     if (serveWwwRoot) {
         app.use(express.static(options.wwwroot));
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "terriajs-server",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "NodeJS server for TerriaJS, consisting of a CORS proxy, proj4 CRS lookup service, ogr2ogr conversion service, and express static server.",
   "engineStrict": true,
   "engines": {