From 4745f15498208153f3c0b333e75fad722baa43e8 Mon Sep 17 00:00:00 2001 From: John Dillick Date: Sun, 20 Feb 2022 16:16:13 -0500 Subject: [PATCH 1/2] Fix windows path separators for generating DDD style partials. --- .core/gulp.tasks.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.core/gulp.tasks.js b/.core/gulp.tasks.js index 952288b9..dd5e2134 100644 --- a/.core/gulp.tasks.js +++ b/.core/gulp.tasks.js @@ -672,10 +672,13 @@ $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((a, b) => { From 1893ce7b22daf871297725094b8b8594edefaf3f Mon Sep 17 00:00:00 2001 From: John Dillick Date: Mon, 21 Feb 2022 08:42:56 -0500 Subject: [PATCH 2/2] Better default styles filename and domain sorting. --- .core/gulp.tasks.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.core/gulp.tasks.js b/.core/gulp.tasks.js index dd5e2134..b568c0ae 100644 --- a/.core/gulp.tasks.js +++ b/.core/gulp.tasks.js @@ -681,6 +681,27 @@ $assets: ( .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 }) =>