diff --git a/.core/gulp.tasks.js b/.core/gulp.tasks.js index 952288b9..b568c0ae 100644 --- a/.core/gulp.tasks.js +++ b/.core/gulp.tasks.js @@ -672,12 +672,36 @@ $assets: ( return partial.replace('reactium_modules/', '+'); } - return path.relative( - path.dirname(config.dest.modulesPartial), - path.resolve(rootPath, partial), - ); + return path + .relative( + path.dirname(config.dest.modulesPartial), + path.resolve(rootPath, partial), + ) + .split(/[\\\/]/g) + .join(path.posix.sep); }) .map(partial => partial.replace(/\.scss$/, '')) + // sort by directory basename + .sort((a, b) => { + const aBase = path + .basename(path.dirname(a)) + .toLocaleLowerCase(); + const bBase = path + .basename(path.dirname(b)) + .toLocaleLowerCase(); + if (aBase > bBase) return 1; + if (aBase < bBase) return -1; + return 0; + }) + // sort by file basename + .sort((a, b) => { + const aBase = path.basename(a).toLocaleLowerCase(); + const bBase = path.basename(b).toLocaleLowerCase(); + if (aBase > bBase) return 1; + if (aBase < bBase) return -1; + return 0; + }) + // sort by priority .sort((a, b) => { const aMatch = SassPartialRegistry.list.find(({ pattern }) =>