Skip to content

Commit 1a8cfdd

Browse files
committed
Move from mime-types package to mime package
1 parent 3ec0a58 commit 1a8cfdd

File tree

6 files changed

+31
-15
lines changed

6 files changed

+31
-15
lines changed

client/modules/Preview/filesReducer.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useMemo } from 'react';
22
import objectID from 'bson-objectid';
33
import blobUtil from 'blob-util';
4-
import mime from 'mime-types';
4+
import mime from 'mime';
55
import { PLAINTEXT_FILE_REGEX } from '../../../server/utils/fileUtils';
66

77
const defaultSketch = `function setup() {
@@ -112,7 +112,9 @@ export function createBlobUrl(file) {
112112
blobUtil.revokeObjectURL(file.blobUrl);
113113
}
114114

115-
const mimeType = mime.lookup(file.name);
115+
const mimeType = mime.getType(file.name) || 'text/plain';
116+
console.log(mimeType);
117+
116118
const fileBlob = blobUtil.createBlob([file.content], { type: mimeType });
117119
const blobURL = blobUtil.createObjectURL(fileBlob);
118120
return blobURL;

package-lock.json

Lines changed: 24 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
"jshint": "^2.13.0",
191191
"lodash": "^4.17.21",
192192
"loop-protect": "github:catarak/loop-protect",
193-
"mime-types": "^2.1.31",
193+
"mime": "^3.0.0",
194194
"mjml": "^3.3.2",
195195
"mockingoose": "^2.15.2",
196196
"mongoose": "^5.13.3",

server/controllers/file.controller.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import each from 'async/each';
2-
import mime from 'mime-types';
2+
import mime from 'mime';
33
import isBefore from 'date-fns/isBefore';
44
import Project from '../models/project';
55
import { resolvePathToFile } from '../utils/filePath';
@@ -162,7 +162,7 @@ export function getFileContent(req, res) {
162162
return;
163163
}
164164
const contentType =
165-
mime.lookup(resolvedFile.name) || 'application/octet-stream';
165+
mime.getType(resolvedFile.name) || 'application/octet-stream';
166166
res.set('Content-Type', contentType);
167167
res.send(resolvedFile.content);
168168
}

webpack/config.dev.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ module.exports = {
3838
'node_modules'
3939
],
4040
fallback: {
41-
"path": require.resolve("path-browserify"),
4241
"os": require.resolve("os-browserify/browser")
4342
}
4443
},

webpack/config.prod.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ module.exports = {
4141
'node_modules',
4242
],
4343
fallback: {
44-
"path": require.resolve("path-browserify"),
4544
"os": require.resolve("os-browserify/browser")
4645
}
4746
},

0 commit comments

Comments
 (0)