Unify mime-type package configuration (#14217)

app/assets/server/assets.js

@@ -2,20 +2,17 @@ import { Meteor } from 'meteor/meteor';
 import { WebApp } from 'meteor/webapp';
 import { settings } from '../../settings';
 import { Settings } from '../../models';
-import { getURL } from '../../utils';
+import { getURL } from '../../utils/lib/isURL';
+import { mime } from '../../utils/lib/mimeTypes';
 import { hasPermission } from '../../authorization';
 import { RocketChatFile } from '../../file';
 import { WebAppHashing } from 'meteor/webapp-hashing';
 import { WebAppInternals } from 'meteor/webapp';
 import _ from 'underscore';
 import sizeOf from 'image-size';
-import mime from 'mime-type/with-db';
 import crypto from 'crypto';
 import sharp from 'sharp';
 
-mime.define('image/vnd.microsoft.icon', { extensions: ['ico'] }, mime.dupAppend);
-mime.define('image/x-icon', { extensions: ['ico'] }, mime.dupAppend);
-
 const RocketChatAssetsInstance = new RocketChatFile.GridFS({
 	name: 'assets',
 });

app/file-upload/server/lib/FileUpload.js

@@ -2,7 +2,6 @@ import { Meteor } from 'meteor/meteor';
 import fs from 'fs';
 import stream from 'stream';
 import streamBuffers from 'stream-buffers';
-import mime from 'mime-type/with-db';
 import Future from 'fibers/future';
 import sharp from 'sharp';
 import { Cookies } from 'meteor/ostrio:cookies';
@@ -16,6 +15,7 @@ import Avatars from '../../../models/server/models/Avatars';
 import Users from '../../../models/server/models/Users';
 import Rooms from '../../../models/server/models/Rooms';
 import Settings from '../../../models/server/models/Settings';
+import { mime } from '../../../utils/lib/mimeTypes';
 import { roomTypes } from '../../../utils/server/lib/roomTypes';
 import { hasPermission } from '../../../authorization/server/functions/hasPermission';
 import { canAccessRoom } from '../../../authorization/server/functions/canAccessRoom';

app/ui-account/client/avatar/prompt.js

@@ -7,10 +7,10 @@ import { settings } from '../../../settings';
 import { callbacks } from '../../../callbacks';
 import { SideNav } from '../../../ui-utils';
 import { t } from '../../../utils';
+import { mime } from '../../../utils/lib/mimeTypes';
 import { fileUploadHandler } from '../../../file-upload';
 import s from 'underscore.string';
 import toastr from 'toastr';
-import mime from 'mime-type/with-db';
 
 Template.avatarPrompt.onCreated(function() {
 	const self = this;

app/ui-message/client/startup/messageBoxActions.js

@@ -2,12 +2,12 @@ import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
-import mime from 'mime-type/with-db';
 import { VRecDialog } from '../../../ui-vrecord/client';
 import { messageBox, modal } from '../../../ui-utils';
 import { fileUpload } from '../../../ui';
 import { settings } from '../../../settings';
 import { t } from '../../../utils';
+import { mime } from '../../../utils/lib/mimeTypes';
 
 messageBox.actions.add('Create_new', 'Video_message', {
 	id: 'video-message',

app/ui/client/lib/fileUpload.js

@@ -37,7 +37,7 @@ const showUploadPreview = (file, callback) => {
 const getAudioUploadPreview = (file, preview) => `\
 <div class='upload-preview'>
 	<audio style="width: 100%;" controls="controls">
-		<source src="${ preview }" type="audio/wav">
+		<source src="${ preview }" type="${ file.file.type }">
 		Your browser does not support the audio element.
 	</audio>
 </div>

app/ui/client/views/app/room.js

@@ -1,6 +1,5 @@
 import _ from 'underscore';
 import moment from 'moment';
-import mime from 'mime-type/with-db';
 import Clipboard from 'clipboard';
 
 import { Meteor } from 'meteor/meteor';
@@ -36,6 +35,7 @@ import { lazyloadtick } from '../../../../lazy-load';
 import { ChatMessages } from '../../lib/chatMessages';
 import { fileUpload } from '../../lib/fileUpload';
 import { isURL } from '../../../../utils/lib/isURL';
+import { mime } from '../../../../utils/lib/mimeTypes';
 
 export const chatMessages = {};
 

app/utils/client/index.js

@@ -20,3 +20,4 @@ export { placeholders } from '../lib/placeholders';
 export { templateVarHandler } from '../lib/templateVarHandler';
 export { APIClient } from './lib/RestApiClient';
 export { canDeleteMessage } from './lib/canDeleteMessage';
+export { mime } from '../lib/mimeTypes';

app/utils/lib/mimeTypes.js

@@ -0,0 +1,8 @@
+import mime from 'mime-type/with-db';
+
+mime.types.wav = 'audio/wav';
+mime.define('image/vnd.microsoft.icon', { extensions: ['ico'] }, mime.dupAppend);
+mime.define('image/x-icon', { extensions: ['ico'] }, mime.dupAppend);
+mime.types.ico = 'image/x-icon';
+
+export { mime };

app/utils/server/index.js

@@ -16,3 +16,4 @@ export { getValidRoomName } from '../lib/getValidRoomName';
 export { placeholders } from '../lib/placeholders';
 export { composeMessageObjectWithUser } from './lib/composeMessageObjectWithUser';
 export { templateVarHandler } from '../lib/templateVarHandler';
+export { mime } from '../lib/mimeTypes';

package-lock.json

@@ -11767,9 +11767,9 @@
 			"integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w=="
 		},
 		"mime-db": {
-			"version": "1.37.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
-			"integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg=="
+			"version": "1.40.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+			"integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
 		},
 		"mime-type": {
 			"version": "3.0.7",
@@ -11783,11 +11783,18 @@
 			}
 		},
 		"mime-types": {
-			"version": "2.1.21",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz",
-			"integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==",
+			"version": "2.1.24",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+			"integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
 			"requires": {
-				"mime-db": "~1.37.0"
+				"mime-db": "1.40.0"
+			},
+			"dependencies": {
+				"mime-db": {
+					"version": "1.40.0",
+					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+					"integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
+				}
 			}
 		},
 		"mimelib": {

package.json

@@ -193,7 +193,7 @@
 		"mem": "4.1.0",
 		"merge-graphql-schemas": "^1.5.2",
 		"meteor-node-stubs": "^0.4.1",
-		"mime-db": "^1.37.0",
+		"mime-db": "^1.40.0",
 		"mime-type": "^3.0.7",
 		"mkdirp": "^0.5.1",
 		"moment": "^2.22.2",