Merge pull request #101 from Frank3K/feat/mime-4-support

thgh · web-flow · commit 3fc2d7643d88 · 2023-12-01T16:26:44.000+01:00
Fix broken package / mime@4 compatibility
diff --git a/package.json b/package.json
@@ -37,14 +37,15 @@
     "dist",
     "index.d.ts"
   ],
+  "type": "module",
   "dependencies": {
-    "mime": "^3",
+    "mime": "^4",
     "opener": "1"
   },
   "devDependencies": {
-    "@rollup/plugin-buble": "0.21.3",
-    "@types/node": "^18.7.15",
-    "rollup": "2",
+    "@rollup/plugin-buble": "^1.0.0",
+    "@types/node": "^20.10.1",
+    "rollup": "4",
     "standard": "17"
   }
 }
diff --git a/src/index.js b/src/index.js
@@ -2,8 +2,11 @@ import { readFile } from 'fs'
 import { createServer as createHttpsServer } from 'https'
 import { createServer } from 'http'
 import { resolve, posix } from 'path'
+import { Mime } from 'mime/lite'
+
+import standardTypes from 'mime/types/standard.js'
+import otherTypes from 'mime/types/other.js'
 
-import mime from 'mime'
 import opener from 'opener'
 
 let server
@@ -13,6 +16,7 @@ let server
  * @param {import('..').RollupServeOptions} options
  */
 function serve (options = { contentBase: '' }) {
+  const mime = new Mime(standardTypes, otherTypes)
   if (Array.isArray(options) || typeof options === 'string') {
     options = { contentBase: options }
   }
@@ -22,7 +26,6 @@ function serve (options = { contentBase: '' }) {
   options.https = options.https || false
   options.openPage = options.openPage || ''
   options.onListening = options.onListening || function noop () { }
-  mime.default_type = 'text/plain'
 
   if (options.mimeTypes) {
     mime.define(options.mimeTypes, true)
@@ -41,7 +44,7 @@ function serve (options = { contentBase: '' }) {
 
     readFileFromContentBase(options.contentBase, urlPath, function (error, content, filePath) {
       if (!error) {
-        return found(response, filePath, content)
+        return found(response, mime.getType(filePath), content)
       }
       if (error.code !== 'ENOENT') {
         response.writeHead(500)
@@ -57,7 +60,7 @@ function serve (options = { contentBase: '' }) {
           if (error) {
             notFound(response, filePath)
           } else {
-            found(response, filePath, content)
+            found(response, mime.getType(filePath), content)
           }
         })
       } else {
@@ -146,8 +149,8 @@ function notFound (response, filePath) {
     '\n\n(rollup-plugin-serve)', 'utf-8')
 }
 
-function found (response, filePath, content) {
-  response.writeHead(200, { 'Content-Type': mime.getType(filePath) })
+function found (response, mimeType, content) {
+  response.writeHead(200, { 'Content-Type': mimeType || 'text/plain' })
   response.end(content, 'utf-8')
 }
 
diff --git a/test/base3/test3.html b/test/base3/test3.html
@@ -0,0 +1,4 @@
+<!doctype html>
+File: /base3/test3.html
+<script src="dest.js"></script>
+<script src="mime.js"></script>
diff --git a/test/fixtures/demo.abc b/test/fixtures/demo.abc
@@ -0,0 +1 @@
+Some text
diff --git a/test/fixtures/demo.fgh b/test/fixtures/demo.fgh
@@ -0,0 +1 @@
+Some text
diff --git a/test/fixtures/demo.json b/test/fixtures/demo.json
@@ -0,0 +1,3 @@
+{
+    "prop": 123
+}
diff --git a/test/frames.html b/test/frames.html
@@ -8,6 +8,12 @@
     width: 200px;
     border: 1px solid #ccc;
   }
+  iframe.auto-height {
+    height: auto;
+  }
+  td[colspan="3"] iframe {
+    width: 100%;
+  }
   th {
     padding-top: 1rem;
     letter-spacing: 1px;
@@ -54,4 +60,12 @@
     <td><iframe src="./base1/test2.html"></iframe></td>
     <td><iframe src="./base2/test2.html"></iframe></td>
   </tr>
+  <tr>
+    <th></th>
+    <th colspan="3">MIME types</th>
+  </tr>
+  <tr>
+    <td>test3.html</td>
+    <td colspan="3"><iframe src="./test3.html" class="auto-height"></iframe></td>
+  </tr>
 </table>
diff --git a/test/mime.js b/test/mime.js
@@ -0,0 +1,24 @@
+"use strict";
+
+async function getMimeType(path) {
+  const response = await fetch(path);
+  return response.headers.get("Content-Type");
+}
+
+async function checkMimes() {
+  const paths = [
+    "fixtures/demo.json",
+    "fixtures/demo.abc",
+    "fixtures/demo.fgh",
+  ];
+  for (const path of paths) {
+    const mimeType = await getMimeType(path);
+    document.body.innerHTML += '<br>"' + path + '": ' + mimeType;
+  }
+}
+
+if (document.readyState === "loading") {
+  window.addEventListener("DOMContentLoaded", checkMimes);
+} else {
+  checkMimes();
+}
diff --git a/test/rollup.config.js b/test/rollup.config.js
@@ -27,8 +27,11 @@ export default {
       open: true,
       openPage: '/frames.html',
       historyApiFallback: '/fallback.html',
-      contentBase: ['.', 'base1', 'base2'],
+      contentBase: ['.', 'base1', 'base2', 'base3'],
       onListening: testOnListening(),
+      mimeTypes: {
+        'text/x-abc': ['abc'],
+      }
     })
   ]
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,11 @@ export default {`
`27`	`27`	`open: true,`
`28`	`28`	`openPage: '/frames.html',`
`29`	`29`	`historyApiFallback: '/fallback.html',`
`30`		`- contentBase: ['.', 'base1', 'base2'],`
	`30`	`+ contentBase: ['.', 'base1', 'base2', 'base3'],`
`31`	`31`	`onListening: testOnListening(),`
	`32`	`+ mimeTypes: {`
	`33`	`+ 'text/x-abc': ['abc'],`
	`34`	`+ }`
`32`	`35`	`})`
`33`	`36`	`]`
`34`	`37`	`}`