tqt/Ghost
2
1
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2023-12-13 21:00:40 +01:00
Code Issues 1 Releases Wiki Activity

ES6 migration: server/web (#9729)

Browse source 
refs #9589
This commit is contained in:
Lars Nolden 2018-07-12 09:35:35 -04:00 committed by Katharina Irrgang
parent a4ce3d1be8
commit 8295f5f967
6 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/server/web/admin/app.js
View file

@ -1,4 +1,4 @@
var debug = require('ghost-ignition').debug('admin'),
const debug = require('ghost-ignition').debug('admin'),
express = require('express'),
// App requires
@ -20,8 +20,7 @@ var debug = require('ghost-ignition').debug('admin'),
module.exports = function setupAdminApp() {
debug('Admin setup start');
var adminApp = express(),
configMaxAge;
const adminApp = express();
// First determine whether we're serving admin or theme content
// @TODO finish refactoring this away.
@ -32,7 +31,7 @@ module.exports = function setupAdminApp() {
// Admin assets
// @TODO ensure this gets a local 404 error handler
configMaxAge = config.get('caching:admin:maxAge');
const configMaxAge = config.get('caching:admin:maxAge');
adminApp.use('/assets', serveStatic(
config.get('paths').clientAssets,
{maxAge: (configMaxAge || configMaxAge === 0) ? configMaxAge : constants.ONE_YEAR_MS, fallthrough: false}
@ -44,7 +43,7 @@ module.exports = function setupAdminApp() {
// Ember CLI's live-reload script
if (config.get('env') === 'development') {
adminApp.get('/ember-cli-live-reload.js', function (req, res) {
res.redirect('http://localhost:4200' + urlService.utils.getSubdir() + '/ghost/ember-cli-live-reload.js');
res.redirect(`http://localhost:4200${urlService.utils.getSubdir()}/ghost/ember-cli-live-reload.js`);
});
}

6
core/server/web/admin/middleware.js
View file

@ -1,8 +1,8 @@
var urlService = require('../../services/url');
const urlService = require('../../services/url');
function redirectAdminUrls(req, res, next) {
var subdir = urlService.utils.getSubdir(),
ghostPathRegex = new RegExp('^' + subdir + '/ghost/(.+)'),
const subdir = urlService.utils.getSubdir(),
ghostPathRegex = new RegExp(`^${subdir}/ghost/(.+)`),
ghostPathMatch = req.originalUrl.match(ghostPathRegex);
if (ghostPathMatch) {

4
core/server/web/admin/serviceworker.js
View file

@ -1,4 +1,4 @@
var debug = require('ghost-ignition').debug('admin:serviceworker'),
const debug = require('ghost-ignition').debug('admin:serviceworker'),
path = require('path');
// Route: index
@ -7,7 +7,7 @@ var debug = require('ghost-ignition').debug('admin:serviceworker'),
module.exports = function adminController(req, res) {
debug('serviceworker called');
var sw = path.join(__dirname, '..', '..', '..', 'built', 'assets', 'sw.js'),
const sw = path.join(__dirname, '..', '..', '..', 'built', 'assets', 'sw.js'),
swr = path.join(__dirname, '..', '..', '..', 'built', 'assets', 'sw-registration.js'),
fileToSend = req.url === '/sw.js' ? sw : swr;

4
core/server/web/api/app.js
View file

@ -1,5 +1,5 @@
// # API routes
var debug = require('ghost-ignition').debug('api'),
const debug = require('ghost-ignition').debug('api'),
express = require('express'),
// routes
@ -18,7 +18,7 @@ var debug = require('ghost-ignition').debug('api'),
module.exports = function setupApiApp() {
debug('API setup start');
var apiApp = express();
const apiApp = express();
// @TODO finish refactoring this away.
apiApp.use(function setIsAdmin(req, res, next) {

2
core/server/web/api/middleware.js
View file

@ -1,4 +1,4 @@
var prettyURLs = require('../middleware/pretty-urls'),
const prettyURLs = require('../middleware/pretty-urls'),
cors = require('../middleware/api/cors'),
urlRedirects = require('../middleware/url-redirects'),
auth = require('../../services/auth');

4
core/server/web/api/routes.js
View file

@ -1,4 +1,4 @@
var express = require('express'),
const express = require('express'),
// This essentially provides the controllers for the routes
api = require('../../api'),
@ -21,7 +21,7 @@ var express = require('express'),
// @TODO refactor/clean this up - how do we want the routing to work long term?
module.exports = function apiRoutes() {
var apiRouter = express.Router();
const apiRouter = express.Router();
// alias delete with del
apiRouter.del = apiRouter.delete;