Release v3, require Node 10, handle html edge case

RDIL · RDIL · commit c5032373a598 · 2021-03-11T21:41:53.000Z
Signed-off-by: Reece Dunham &lt;me@rdil.rocks&gt;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "static-server-rdil",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "description": "Static web server",
     "homepage": "https://github.com/rdilweb/static-server",
     "bin": {
@@ -53,5 +53,8 @@
     "repository": {
         "type": "git",
         "url": "https://github.com/rdilweb/static-server.git"
+    },
+    "engines": {
+        "node": ">=10.13.0"
     }
 }
diff --git a/source/markdownRendering.ts b/source/markdownRendering.ts
@@ -13,7 +13,7 @@ const render = (htmlBody: string): string => `\
                 display: flex;
                 justify-content: center;
             }
-            #mn {
+            .mn {
                 width: 90%;
                 margin-top: 2%;
             }
@@ -23,7 +23,7 @@ const render = (htmlBody: string): string => `\
         </style>
     </head>
     <body>
-        <div id="mn">
+        <div class="mn">
             ${htmlBody}
         </div>
     </body>
diff --git a/source/serverHandling.ts b/source/serverHandling.ts
@@ -1,6 +1,6 @@
 import { lookup } from "mime-types"
 import { join, extname } from "path"
-import { stat as _stat, createReadStream, readFile } from "fs"
+import { stat as _stat, createReadStream, readFile, existsSync } from "fs"
 import chalk from "chalk"
 import getHeaders from "./headers"
 import markdown from "./markdownRendering"
@@ -19,6 +19,12 @@ const handle = (
         // try to look up file
         _stat(filePath, (err, stat) => {
             if (err) {
+                // last ditch attempt to make sure this isn't just a case where its something like about-us.html
+                // being used like /about-us in the browser, which is fairly common now
+                if (existsSync(`${filePath}.html`)) {
+                    return handleRealFile(response, "html", enhancedSecurity, `${filePath}.html`)
+                }
+
                 response.statusCode = err.code === "ENOENT" ? 404 : 500
                 response.end()
             } else if (stat.isDirectory()) {
@@ -33,16 +39,17 @@ const handle = (
             } else {
                 // actual file
                 const fileExtension = extname(filePath)
+
                 if (fileExtension !== ".md" || !renderMarkdown) {
-                    handleRealFile(
+                    return handleRealFile(
                         response,
                         fileExtension,
                         enhancedSecurity,
                         filePath
                     )
-                } else {
-                    handleMarkdown(response, enhancedSecurity, filePath)
                 }
+
+                handleMarkdown(response, enhancedSecurity, filePath)
             }
         })
     } catch (e) {
@@ -87,7 +94,7 @@ const handleRealFile = (
 ) => {
     let mimetype = lookup(fileExtension)
 
-    if (mimetype === false) {
+    if (!mimetype) {
         console.log(
             chalk`{yellow Unable to find mime-type for file of type {reset ${fileExtension}}!}`
         )
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "compilerOptions": {
         "incremental": true,
-        "target": "es5",
+        "target": "ES2018",
         "module": "commonjs",
         "allowJs": true,
         "declaration": true,

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "static-server-rdil",`
`3`		`- "version": "2.0.0",`
	`3`	`+ "version": "3.0.0",`
`4`	`4`	`"description": "Static web server",`
`5`	`5`	`"homepage": "https://github.com/rdilweb/static-server",`
`6`	`6`	`"bin": {`
`@@ -53,5 +53,8 @@`
`53`	`53`	`"repository": {`
`54`	`54`	`"type": "git",`
`55`	`55`	`"url": "https://github.com/rdilweb/static-server.git"`
	`56`	`+ },`
	`57`	`+ "engines": {`
	`58`	`+ "node": ">=10.13.0"`
`56`	`59`	`}`
`57`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"compilerOptions": {`
`3`	`3`	`"incremental": true,`
`4`		`- "target": "es5",`
	`4`	`+ "target": "ES2018",`
`5`	`5`	`"module": "commonjs",`
`6`	`6`	`"allowJs": true,`
`7`	`7`	`"declaration": true,`