Downgrade mime - they wont support require

webgme · Jun 18, 2024 · ca01747 · ca01747
1 parent 45ebf59
commit ca01747
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 43 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -64,12 +64,11 @@
     "debug": "4.3.4",
     "ejs": "^3.1.9",
     "express": "^4.18.2",
-    "fix-esm": "^1.0.1",
     "import-fresh": "^3.3.0",
     "jsdoc": "^4.0.2",
     "jsonwebtoken": "^9.0.2",
     "method-override": "^3.0.0",
-    "mime": "^4.0.3",
+    "mime": "^3.0.0",
     "mongo-uri": "0.1.2",
     "mongodb": "^3.7.3",
     "ncp": "2.0.0",

diff --git a/src/server/middleware/blob/BlobBackendBase.js b/src/server/middleware/blob/BlobBackendBase.js
@@ -9,7 +9,7 @@
 'use strict';
 
 var fs = require('fs'),
-    mime = require('fix-esm').require('mime'),
+    mime = require('mime'),
     archiver = require('archiver'),
     Q = require('q'),
 

diff --git a/test/_globals.js b/test/_globals.js
@@ -367,8 +367,8 @@ function clearDBAndGetGMEAuth(gmeConfigParameter, projectNameOrNames, callback)
             };
 
             return Q.allDone([
-                gmeAuth.addUser(guestAccount, guestAccount + '@example.com', guestAccount, true, {overwrite: true}),
-                gmeAuth.addUser('admin', '[email protected]', 'admin', true, {overwrite: true, siteAdmin: true})
+                gmeAuth.addUser(guestAccount, guestAccount + '@example.com', guestAccount, true, { overwrite: true }),
+                gmeAuth.addUser('admin', '[email protected]', 'admin', true, { overwrite: true, siteAdmin: true })
             ]);
         })
         .then(function () {
@@ -429,29 +429,33 @@ function importProject(storage, parameters, callback) {
         branchName,
         data = {};
 
-    // Parameters check.
-    exports.expect(typeof storage).to.equal('object');
-    exports.expect(typeof parameters).to.equal('object');
-    exports.expect(typeof parameters.projectName).to.equal('string');
-    exports.expect(typeof parameters.gmeConfig).to.equal('object');
-    exports.expect(typeof parameters.logger).to.equal('object');
-
-    if (Object.hasOwn(parameters, 'username')) {
-        exports.expect(typeof parameters.username).to.equal('string');
-        data.username = parameters.username;
-    }
+    try {
+        // Parameters check.
+        exports.expect(typeof storage).to.equal('object');
+        exports.expect(typeof parameters).to.equal('object');
+        exports.expect(typeof parameters.projectName).to.equal('string');
+        exports.expect(typeof parameters.gmeConfig).to.equal('object');
+        exports.expect(typeof parameters.logger).to.equal('object');
+
+        if (Object.hasOwn(parameters, 'username')) {
+            exports.expect(typeof parameters.username).to.equal('string');
+            data.username = parameters.username;
+        }
 
-    if (Object.hasOwn(parameters, 'ownerId')) {
-        exports.expect(typeof parameters.ownerId).to.equal('string');
-        data.ownerId = parameters.ownerId;
-    }
+        if (Object.hasOwn(parameters, 'ownerId')) {
+            exports.expect(typeof parameters.ownerId).to.equal('string');
+            data.ownerId = parameters.ownerId;
+        }
 
-    if (Object.hasOwn(parameters, 'kind')) {
-        exports.expect(typeof parameters.kind).to.equal('string');
-        data.kind = parameters.kind;
+        if (Object.hasOwn(parameters, 'kind')) {
+            exports.expect(typeof parameters.kind).to.equal('string');
+            data.kind = parameters.kind;
+        }
+    } catch (err) {
+        extractDeferred.reject(err);
     }
 
-    if (typeof parameters.projectSeed === 'string' && parameters.projectSeed.toLowerCase().indexOf('.webgmex')) {
+    if (typeof parameters.projectSeed === 'string' && parameters.projectSeed.toLowerCase().indexOf('.webgmex') > -1) {
         BC = require('../src/server/middleware/blob/BlobClientWithFSBackend');
         blobClient = new BC(parameters.gmeConfig, parameters.logger);
         cliImport = require('../src/bin/import');
@@ -476,10 +480,7 @@ function importProject(storage, parameters, callback) {
             return storage.createProject(data);
         })
         .then(function (project) {
-            var core = new exports.Core(project, {
-                    globConf: parameters.gmeConfig,
-                    logger: parameters.logger
-                }),
+            var core = new exports.Core(project, { globConf: parameters.gmeConfig, logger: parameters.logger }),
                 result = {
                     status: null,
                     branchName: branchName,
@@ -519,9 +520,7 @@ function importProject(storage, parameters, callback) {
                 })
                 .catch(deferred.reject);
         })
-        .catch(function (err) {
-            deferred.reject(err);
-        });
+        .catch(deferred.reject);
 
     return deferred.promise.nodeify(callback);
 }
@@ -622,7 +621,7 @@ function openSocketIo(server, agent, userName, password, token) {
         deferred = Q.defer(),
         loginPromise,
         socket,
-        socketReq = {url: serverBaseUrl},
+        socketReq = { url: serverBaseUrl },
         webgmeToken;
 
     if (server.getGmeConfig().authentication.enable === true) {
@@ -662,7 +661,7 @@ function openSocketIo(server, agent, userName, password, token) {
             });
 
             socket.on('connect', function () {
-                deferred.resolve({socket: socket, webgmeToken: webgmeToken});
+                deferred.resolve({ socket: socket, webgmeToken: webgmeToken });
             });
         })
         .catch(function (err) {