Skip to content

Commit 45af524

Browse files
authored
Merge branch 'develop' into version-switcher
2 parents d7088fb + 08b0d81 commit 45af524

File tree

5 files changed

+173
-167
lines changed

5 files changed

+173
-167
lines changed

client/styles/components/_console.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
@extend %link;
9090
color: getThemifyVariable('secondary-text-color');
9191
&:hover {
92-
color: getThemifyVariable('heavy-text-color');
92+
color: getThemifyVariable('logo-color');
9393
}
9494
}
9595
background: transparent;

package-lock.json

+9-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "p5.js-web-editor",
3-
"version": "2.15.8",
3+
"version": "2.15.9",
44
"description": "The web editor for p5.js.",
55
"scripts": {
66
"clean": "rimraf dist",

server/controllers/project.controller.js

+5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import JSZip from 'jszip';
22
import format from 'date-fns/format';
33
import isUrl from 'is-url';
44
import { JSDOM } from 'jsdom';
5+
import mime from 'mime';
56
import isAfter from 'date-fns/isAfter';
67
import axios from 'axios';
78
import slugify from 'slugify';
@@ -125,14 +126,18 @@ export async function getProjectAsset(req, res) {
125126
if (!resolvedFile) {
126127
return res.status(404).send({ message: 'Asset does not exist' });
127128
}
129+
const contentType =
130+
mime.getType(resolvedFile.name) || 'application/octet-stream';
128131
if (!resolvedFile.url) {
132+
res.set('Content-Type', contentType);
129133
return res.send(resolvedFile.content);
130134
}
131135

132136
try {
133137
const { data } = await axios.get(resolvedFile.url, {
134138
responseType: 'arraybuffer'
135139
});
140+
res.set('Content-Type', contentType);
136141
return res.send(data);
137142
} catch (error) {
138143
return res.status(404).send({ message: 'Asset does not exist' });

0 commit comments

Comments
 (0)