Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-11 02:12:21 -05:00
Code Issues Activity

🎨 Change asset path to /ghost/assets (#7504)

Browse source 
closes #7503

- Update this server-side to serve assets from ghost/assets
- a Ghost-Admin PR changes the client to always request them from there
This commit is contained in:
Hannah Wolfe 2016-10-07 23:05:36 +01:00 • committed by Austin Burdine
parent 2550cdcac6
commit c74f65683e
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/server/data/meta/asset_url.js
View file

@ -9,9 +9,9 @@ function getAssetUrl(path, isAdmin, minify) {
if (!path.match(/^favicon\.ico$/) && !path.match(/^shared/) && !path.match(/^asset/)) { if (!path.match(/^favicon\.ico$/) && !path.match(/^shared/) && !path.match(/^asset/)) {
if (isAdmin) { if (isAdmin) {
output += 'ghost/'; output += 'ghost/';
} else {
output += 'assets/';
} }
output += 'assets/';
} }
// Get rid of any leading slash on the path // Get rid of any leading slash on the path

2
core/server/middleware/index.js
View file

@ -135,7 +135,7 @@ setupMiddleware = function setupMiddleware(blogApp) {
blogApp.use(themeHandler.configHbsForContext); blogApp.use(themeHandler.configHbsForContext);
// Admin only config // Admin only config
blogApp.use('/ghost', serveStatic( blogApp.use('/ghost/assets', serveStatic(
config.get('paths').clientAssets, config.get('paths').clientAssets,
{maxAge: utils.ONE_YEAR_MS} {maxAge: utils.ONE_YEAR_MS}
)); ));

2
core/test/functional/routes/frontend_spec.js
View file

@ -320,7 +320,7 @@ describe('Frontend Routing', function () {
}); });
it('should retrieve built assets', function (done) { it('should retrieve built assets', function (done) {
request.get('/ghost/vendor.js') request.get('/ghost/assets/vendor.js')
.expect('Cache-Control', testUtils.cacheRules.year) .expect('Cache-Control', testUtils.cacheRules.year)
.expect(200) .expect(200)
.end(doEnd(done)); .end(doEnd(done));

2
core/test/unit/metadata/asset_url_spec.js
View file

@ -14,7 +14,7 @@ describe('getAssetUrl', function () {
it('should return ghost url if is admin', function () { it('should return ghost url if is admin', function () {
var testUrl = getAssetUrl('myfile.js', true); var testUrl = getAssetUrl('myfile.js', true);
testUrl.should.equal('/ghost/myfile.js?v=' + config.get('assetHash')); testUrl.should.equal('/ghost/assets/myfile.js?v=' + config.get('assetHash'));
}); });
it('should not add ghost to url if is admin and has asset in context', function () { it('should not add ghost to url if is admin and has asset in context', function () {

4
core/test/unit/server_helpers/asset_spec.js
View file

@ -52,7 +52,7 @@ describe('{{asset}} helper', function () {
// with ghost set // with ghost set
rendered = helpers.asset('js/asset.js', {hash: {ghost: 'true'}}); rendered = helpers.asset('js/asset.js', {hash: {ghost: 'true'}});
should.exist(rendered); should.exist(rendered);
String(rendered).should.equal('/ghost/js/asset.js?v=abc'); String(rendered).should.equal('/ghost/assets/js/asset.js?v=abc');
}); });
it('handles theme assets correctly', function () { it('handles theme assets correctly', function () {
@ -96,7 +96,7 @@ describe('{{asset}} helper', function () {
// with ghost set // with ghost set
rendered = helpers.asset('js/asset.js', {hash: {ghost: 'true'}}); rendered = helpers.asset('js/asset.js', {hash: {ghost: 'true'}});
should.exist(rendered); should.exist(rendered);
String(rendered).should.equal('/blog/ghost/js/asset.js?v=abc'); String(rendered).should.equal('/blog/ghost/assets/js/asset.js?v=abc');
}); });
it('handles theme assets correctly', function () { it('handles theme assets correctly', function () {