mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-23 05:43:07 +02:00
merge: fix: sort multiple config files (#285)
This commit is contained in:
commit
49885504b9
1 changed files with 1 additions and 1 deletions
|
@ -201,7 +201,7 @@ export function loadConfig(): Config {
|
||||||
JSON.parse(fs.readFileSync(`${_dirname}/../../../built/_vite_/manifest.json`, 'utf-8'))
|
JSON.parse(fs.readFileSync(`${_dirname}/../../../built/_vite_/manifest.json`, 'utf-8'))
|
||||||
: { 'src/_boot_.ts': { file: 'src/_boot_.ts' } };
|
: { 'src/_boot_.ts': { file: 'src/_boot_.ts' } };
|
||||||
|
|
||||||
const config = globSync(path)
|
const config = globSync(path).sort()
|
||||||
.map(path => fs.readFileSync(path, 'utf-8'))
|
.map(path => fs.readFileSync(path, 'utf-8'))
|
||||||
.map(contents => yaml.load(contents) as Source)
|
.map(contents => yaml.load(contents) as Source)
|
||||||
.reduce(
|
.reduce(
|
||||||
|
|
Loading…
Reference in a new issue