gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: don't override empty public folder (#3513)

Browse Source
This commit is contained in:
Erez Rokah 2020-04-01 13:16:30 +03:00 committed by GitHub
parent cc89aa5c43
commit a1bf86e856
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/netlify-cms-core/src/actions/__tests__/config.spec.js
View File

@ -57,6 +57,16 @@ describe('config', () => {
}), }),
).get('public_folder'), ).get('public_folder'),
).toEqual('/publib/path'); ).toEqual('/publib/path');
expect(
applyDefaults(
fromJS({
foo: 'bar',
media_folder: 'path/to/media',
public_folder: '',
collections: [],
}),
).get('public_folder'),
).toEqual('');
}); });
}); });

2
packages/netlify-cms-core/src/actions/config.js
View File

@ -39,7 +39,7 @@ export function applyDefaults(config) {
// Use media_folder as default public_folder. // Use media_folder as default public_folder.
const defaultPublicFolder = `/${trimStart(map.get('media_folder'), '/')}`; const defaultPublicFolder = `/${trimStart(map.get('media_folder'), '/')}`;
if (!map.get('public_folder')) { if (!map.has('public_folder')) {
map.set('public_folder', defaultPublicFolder); map.set('public_folder', defaultPublicFolder);
} }