small changes

Author: tlienart

Project.toml

@@ -1,7 +1,7 @@
 name = "LiveServer"
 uuid = "16fef848-5104-11e9-1b77-fb7a48bbb589"
 authors = ["Jonas Asprion <jonas.asprion@gmx.ch", "Thibaut Lienart <tlienart@me.com>"]
-version = "0.8"
+version = "0.8.1"
 
 [deps]
 Crayons = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f"

docs/Project.toml

@@ -3,4 +3,4 @@ Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 LiveServer = "16fef848-5104-11e9-1b77-fb7a48bbb589"
 
 [compat]
-Documenter = "^0.24, ^0.25"
+Documenter = "^0.27"

docs/make.jl

@@ -25,5 +25,5 @@ makedocs(
 )
 
 deploydocs(
-    repo = "github.com/asprionj/LiveServer.jl.git"
+    repo = "github.com/tlienart/LiveServer.jl.git"
 )

src/server.jl

@@ -257,13 +257,11 @@ function serve_file(
         return HTTP.Response(200, index_page)
     end
 
-    #
     # In what follows, fs_path points to a file
     # --> html-like: try to inject reload-script
     # --> other: just get the browser to show it
     #
-
-    ext = lstrip(last(splitext(fs_path)), '.')
+    ext     = lstrip(last(splitext(fs_path)), '.') |> string
     content = read(fs_path, String)
 
     # build the response with appropriate mime type (this is inspired from Mux
@@ -277,9 +275,25 @@ function serve_file(
         end
     end
 
+    # avoid overly-specific text types so the browser can try rendering
+    # all text-like documents instead of offering to download all files
+    m = match(r"^text\/(.*?);(.*)$", content_type)
+    if m !== nothing
+        text_type = m.captures[1]
+        if text_type ∉ ("html", "javascript", "css")
+            content_type = "text/plain;$(m.captures[2])"
+        end
+    end
+    plain = "text/plain; charset=utf8"
+    content_type = replace(
+        content_type,
+        "application/toml" => plain,
+        "application/x-sh" => plain
+    )
+
     # if html-like, try adding the browser-sync script to it
     inject_reload = inject_browser_reload_script && (
-            startswith(content_type, "text/html") || 
+            startswith(content_type, "text/html") ||
             startswith(content_type, "application/xhtml+xml")
         )
 
@@ -301,6 +315,7 @@ function serve_file(
     end
 
     headers = ["Content-Type" => content_type]
+
     if allow_cors
         push!(headers, "Access-Control-Allow-Origin" => "*")
     end

test/mimes/cpp.cpp

@@ -0,0 +1,6 @@
+#include <iostream>
+
+int main()
+{
+    std::cout << "Hello, world!\n";
+}

test/mimes/foo.h

@@ -0,0 +1,5 @@
+#ifdef MACRO
+
+controlled text
+
+#endif /* MACRO */

test/mimes/jl.jl

@@ -0,0 +1,3 @@
+function foo()
+    return 0
+end

test/mimes/py.py

@@ -0,0 +1,2 @@
+def foo():
+    return 0

test/mimes/sh.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+for i in 'Alfa Romeo' 'Bentley' 'Citroën'; do
+    echo $i
+done

test/mimes/toml.toml

@@ -0,0 +1,12 @@
+# Das ist ein TOML-Dokument.
+title = "TOML Beispiel"
+
+[person]
+name = "Tom Preston-Werner"
+geburtstag = 1979-05-27T07:32:00-08:00
+
+[datenbank]
+adresse = "192.168.1.1"
+ports = [ 8001, 8001, 8002 ]
+verbindungen_max = 5000
+aktiviert = true # booleans