diff --git a/package-lock.json b/package-lock.json index e84247c..e844354 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3999,11 +3999,6 @@ } } }, - "mime": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz", - "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==" - }, "mime-db": { "version": "1.44.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", @@ -5501,22 +5496,6 @@ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" }, - "sirv": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/sirv/-/sirv-0.4.6.tgz", - "integrity": "sha512-rYpOXlNbpHiY4nVXxuDf4mXPvKz1reZGap/LkWp9TvcZ84qD/nPBjjH/6GZsgIjVMbOslnY8YYULAyP8jMn1GQ==", - "requires": { - "@polka/url": "^0.5.0", - "mime": "^2.3.1" - }, - "dependencies": { - "@polka/url": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@polka/url/-/url-0.5.0.tgz", - "integrity": "sha512-oZLYFEAzUKyi3SKnXvj32ZCEGH6RDnao7COuCVhDydMS9NrCSVXhM79VaKyP5+Zc33m0QXEd2DN3UkU7OsHcfw==" - } - } - }, "sliced": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz", diff --git a/package.json b/package.json index 50f34d1..b06bf42 100644 --- a/package.json +++ b/package.json @@ -29,8 +29,7 @@ "passport": "^0.4.1", "passport-local": "^1.0.0", "rate-limiter-flexible": "^2.1.7", - "session-file-store": "^1.4.0", - "sirv": "^0.4.0" + "session-file-store": "^1.4.0" }, "devDependencies": { "@babel/core": "^7.10.3", diff --git a/src/server.js b/src/server.js index c8aab96..334e7b6 100644 --- a/src/server.js +++ b/src/server.js @@ -1,4 +1,3 @@ -import sirv from 'sirv'; import express from 'express'; import session from 'express-session'; import compression from 'compression'; @@ -293,7 +292,8 @@ express() } const ext = image.name.match(/(\.[^.]+)$/)[0]; const filename = crypto.randomBytes(20).toString('hex') + ext; - await image.mv('./static/a/' + filename); + const url = `/a/${filename}`; + await image.mv('./static' + url); const article = await new Article({ html, title, image: filename, category: cat, author: req.user._id }); await article.save(); res.writeHead(200, { @@ -500,7 +500,7 @@ express() ) .use(compression({ threshold: 0 })) - .use(sirv('./static', { dev })) + .use(express.static('./static')) .use(sapper.middleware({ session: req => ({ user: req.session.passport ? req.session.passport.user : null