ES6 migrations for web folder #9886

naz · 2018-09-19T13:16:48Z

Migrations! 💨

var -> let / const
multiple declarations
function -> =>
'a ' + 'b' -> ${a}${b}
_. substitution where possible
_. made specific imports instead of getting the entire module

core/server/web/utils.js

core/server/web/middleware/validation/blog-icon.js

core/server/web/middleware/api/spam-prevention.js

+
+let store;
+let handleStoreError;
+let globalBlock;


core/server/web/admin/app.js


 module.exports = function setupAdminApp() {
    debug('Admin setup start');
    const adminApp = express();

    // First determine whether we're serving admin or theme content
    // @TODO finish refactoring this away.
-    adminApp.use(function setIsAdmin(req, res, next) {
+    adminApp.use((req, res, next) => {


core/server/web/middleware/admin-redirects.js

-const adminRedirect = function adminRedirect(path) {
-    return function doRedirect(req, res) {
+const adminRedirect = (path) => {
+    return (req, res) => {


core/server/web/middleware/cache-control.js

        output = profiles[options];
    }

-    return function cacheControlHeaders(req, res, next) {
+    return (req, res, next) => {


core/server/web/middleware/custom-redirects.js

@@ -75,7 +76,7 @@ exports.use = function use(siteApp) {

    // Recommended approach by express, see https://github.com/expressjs/express/issues/2596#issuecomment-81353034.
    // As soon as the express router get's re-instantiated, the old router instance is not used anymore.
-    siteApp.use(function (req, res, next) {
+    siteApp.use((req, res, next) => {


core/server/web/middleware/serve-favicon.js


-    return function serveFavicon(req, res, next) {
+    return (req, res, next) => {


core/server/web/middleware/serve-public-file.js


-    return function servePublicFile(req, res, next) {
+    return (req, res, next) => {


core/server/web/middleware/static-theme.js

@@ -29,10 +31,11 @@ function forwardToExpressStatic(req, res, next) {
 }

 function staticTheme() {
-    return function blackListStatic(req, res, next) {
+    return (req, res, next) => {


core/server/web/middleware/validation/blog-icon.js


 module.exports = function blogIcon() {
    // we checked for a valid image file, now we need to do validations for blog icons
-    return function blogIconValidation(req, res, next) {
-        var iconExtensions = (config.get('uploads').icons && config.get('uploads').icons.extensions) || [];
+    return (req, res, next) => {


core/server/web/middleware/validation/upload.js

-    return function uploadValidation(req, res, next) {
-        var extensions = (config.get('uploads')[type] && config.get('uploads')[type].extensions) || [],
-            contentTypes = (config.get('uploads')[type] && config.get('uploads')[type].contentTypes) || [];
+    return (req, res, next) => {


core/server/web/site/app.js

kirrg001

👍

… stack

core/server/web/middleware/validation/blog-icon.js

no issue - discovered here: TryGhost#9886 (comment) - `setPrototypeOf` is a npm package and a dependency of e.g. express - we can use `Object.setPrototypeOf` instead

no issue - discovered here: #9886 (comment) - `setPrototypeOf` is a npm package and a dependency of e.g. express - we can use `Object.setPrototypeOf` instead

naz added affects:api Affects the Ghost API refactoring/cleanup labels Sep 19, 2018

naz assigned kirrg001 and rishabhgrg Sep 19, 2018

naz requested review from kirrg001 and rishabhgrg September 19, 2018 13:16

naz commented Sep 19, 2018

View reviewed changes

core/server/web/utils.js Show resolved Hide resolved

naz commented Sep 19, 2018

View reviewed changes

core/server/web/middleware/validation/blog-icon.js Show resolved Hide resolved

naz commented Sep 19, 2018

View reviewed changes

core/server/web/middleware/api/spam-prevention.js Outdated

let store;

let handleStoreError;

let globalBlock;

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view