From 6b340a66b473138580757cb119ff3888c762c5f9 Mon Sep 17 00:00:00 2001 From: Rhys Evans Date: Mon, 26 Jun 2017 14:39:30 +0100 Subject: [PATCH] lint --- server/lib/asset-manager/asset-url-generator.js | 4 ++-- server/lib/asset-manager/index.js | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/server/lib/asset-manager/asset-url-generator.js b/server/lib/asset-manager/asset-url-generator.js index d97784562..33cd0e9d6 100644 --- a/server/lib/asset-manager/asset-url-generator.js +++ b/server/lib/asset-manager/asset-url-generator.js @@ -11,7 +11,7 @@ const loadAssetHashesJson = path => { } } -module.exports = (appName, directory, useLocalAppShell) => { +module.exports = ({ appName, isProduction, directory, useLocalAppShell }) => { const assetHashes = loadAssetHashesJson(`${directory}/public/asset-hashes.json`); const nUiAssetHashes = loadAssetHashesJson(`${directory}/public/n-ui-asset-hashes.json`); @@ -36,7 +36,7 @@ module.exports = (appName, directory, useLocalAppShell) => { } else { const fallback = `/${appName}/${file}`; const hash = assetHashes[file]; - return (!locals.__isProduction || !hash) ? fallback : `//www.ft.com/__assets/hashed/${appName}/${hash}`; + return (!isProduction || !hash) ? fallback : `//www.ft.com/__assets/hashed/${appName}/${hash}`; } } diff --git a/server/lib/asset-manager/index.js b/server/lib/asset-manager/index.js index c2e827a38..834eabbd7 100644 --- a/server/lib/asset-manager/index.js +++ b/server/lib/asset-manager/index.js @@ -31,11 +31,12 @@ function init (options, directory, app) { } // initialise helper for calculating paths to assets - const getAssetUrl = assetUrlGenerator( - app.locals.__name, + const getAssetUrl = assetUrlGenerator({ + appName: app.locals.__name, + isProduction: app.locals.__isProduction, directory, useLocalAppShell - ); + }); //expose the asset hashing helper to apps (in case they build non-standard files) // TODO deprecate this name in future release