Skip to content

Commit cea20e8

Browse files
jdillickjdillick
committed
Remove less module. Add _reactium-style.scss DDD scss partial. Add style:partials gulp task.
1 parent 2d35cb0 commit cea20e8

File tree

8 files changed

+81
-391
lines changed

8 files changed

+81
-391
lines changed

‎.core/gulp.config.js‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,19 @@ const defaultConfig = {
2323
serverRetries: 4,
2424
serverRetryDelay: 2000,
2525
open: true,
26-
cssPreProcessor: 'sass',
2726
watch: {
2827
js: ['src/app/**/*', 'reactium_modules/**/*'],
2928
markup: ['src/**/*.html', 'src/**/*.css', 'reactium_modules/**/*.css'],
3029
colors: ['src/**/*/colors.json'],
3130
pluginAssets: ['src/app/**/plugin-assets.json'],
3231
restartWatches: [
33-
'src/**/assets/style/*.less',
3432
'src/**/assets/style/*.scss',
35-
'!src/**/assets/style/_*.less',
3633
'!src/**/assets/style/_*.scss',
3734
],
3835
style: [
39-
'src/**/*.less',
4036
'src/**/*.scss',
41-
'.core/**/*.less',
4237
'.core/**/*.scss',
4338
'reactium_modules/**/*.scss',
44-
'!{src/**/assets/style/*.less}',
4539
'!{src/**/assets/style/*.scss}',
4640
'!{reactium_modules/**/assets/style/*.scss}',
4741
],
@@ -72,6 +66,10 @@ const defaultConfig = {
7266
'!{.core/**/_*.scss}',
7367
'!{reactium_modules/**/_*.scss}',
7468
],
69+
styleDDD: [
70+
'src/**/*/_reactium-style.scss',
71+
'reactium_modules/**/*/_reactium-style.scss',
72+
],
7573
assets: [
7674
'.core/assets/**/*',
7775
'src/**/assets/**/*',
@@ -108,6 +106,7 @@ const defaultConfig = {
108106
build: 'build/src',
109107
buildCore: 'build/core',
110108
colors: 'src/assets/style/_scss/_colors.scss',
109+
modulesPartial: 'src/assets/style/_scss/_reactium-modules.scss',
111110
startPath: '/',
112111
},
113112
umd: {

‎.core/gulp.tasks.js‎

Lines changed: 69 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const sass = require('gulp-sass')(require('sass'));
1414
const fiber = require('fibers');
1515
const gzip = require('gulp-gzip');
1616
const reactiumImporter = require('@atomic-reactor/node-sass-reactium-importer');
17-
const less = require('gulp-less');
1817
const cleanCSS = require('gulp-clean-css');
1918
const sourcemaps = require('gulp-sourcemaps');
2019
const rename = require('gulp-rename');
@@ -540,66 +539,88 @@ $assets: (
540539
done();
541540
};
542541

542+
const dddStylesPartial = done => {
543+
const stylePartials = globby
544+
.sync(config.src.styleDDD)
545+
.map(partial => {
546+
if (/^reactium_modules\//.test(partial)) {
547+
return partial.replace('reactium_modules/', '+');
548+
}
549+
550+
return path.relative(
551+
path.dirname(config.dest.modulesPartial),
552+
path.resolve(rootPath, partial),
553+
);
554+
})
555+
.map(partial => partial.replace(/\.scss$/, ''));
556+
557+
const template = handlebars.compile(`
558+
// WARNING: Do not directly edit this file !!!!
559+
// File generated by gulp styles:partials task
560+
561+
{{#each this}}
562+
@import '{{ this }}';
563+
{{/each}}
564+
`);
565+
566+
fs.ensureFileSync(config.dest.modulesPartial);
567+
fs.writeFileSync(
568+
config.dest.modulesPartial,
569+
template(stylePartials),
570+
'utf8',
571+
);
572+
done();
573+
};
574+
543575
const stylesColors = done => {
544-
if (config.cssPreProcessor === 'sass') {
545-
// Currently only works with sass
546-
let colorProfiles = globby.sync(config.src.colors);
547-
if (colorProfiles.length > 0) {
548-
let colorFileContents =
549-
'// WARNING: Do not directly edit this file !!!!\n// File generated by gulp styles:colors task\n';
550-
let colorVars = [];
551-
let colorArr = [];
552-
553-
colorProfiles.forEach(filePath => {
554-
let profile = fs.readFileSync(path.resolve(filePath));
555-
profile = JSON.parse(profile);
556-
557-
colorVars.push(`\n\n// ~/${filePath}`);
558-
559-
Object.keys(profile).forEach(k => {
560-
let code = profile[k];
561-
let cvar = `$${k}`;
562-
let vline = `${cvar}: ${code} !default;`;
563-
let cname = k.split('color-').join('');
564-
let aline = `\t"${cname}": ${cvar}`;
565-
566-
colorVars.push(vline);
567-
colorArr.push(aline);
568-
});
576+
const colorProfiles = globby.sync(config.src.colors);
577+
if (colorProfiles.length > 0) {
578+
let colorFileContents =
579+
'// WARNING: Do not directly edit this file !!!!\n// File generated by gulp styles:colors task\n';
580+
let colorVars = [];
581+
let colorArr = [];
582+
583+
colorProfiles.forEach(filePath => {
584+
let profile = fs.readFileSync(path.resolve(filePath));
585+
profile = JSON.parse(profile);
586+
587+
colorVars.push(`\n\n// ~/${filePath}`);
588+
589+
Object.keys(profile).forEach(k => {
590+
let code = profile[k];
591+
let cvar = `$${k}`;
592+
let vline = `${cvar}: ${code} !default;`;
593+
let cname = k.split('color-').join('');
594+
let aline = `\t"${cname}": ${cvar}`;
595+
596+
colorVars.push(vline);
597+
colorArr.push(aline);
569598
});
599+
});
570600

571-
colorFileContents += colorVars.join('\n') + '\n\n\n';
572-
colorFileContents += `$color: (\n${colorArr.join(
573-
',\n',
574-
)}\n) !default;\n\n\n`;
601+
colorFileContents += colorVars.join('\n') + '\n\n\n';
602+
colorFileContents += `$color: (\n${colorArr.join(
603+
',\n',
604+
)}\n) !default;\n\n\n`;
575605

576-
fs.ensureFileSync(config.dest.colors);
577-
fs.writeFileSync(config.dest.colors, colorFileContents, 'utf8');
578-
}
606+
fs.ensureFileSync(config.dest.colors);
607+
fs.writeFileSync(config.dest.colors, colorFileContents, 'utf8');
579608
}
580609

581610
done();
582611
};
583612

584613
const stylesCompile = () => {
585-
// Compile Sass & Less
586-
let isSass = config.cssPreProcessor === 'sass';
587-
let isLess = config.cssPreProcessor === 'less';
588-
589614
return gulp
590615
.src(config.src.style)
591616
.pipe(gulpif(isDev, sourcemaps.init()))
592617
.pipe(
593-
gulpif(
594-
isSass,
595-
sass({
596-
importer: reactiumImporter,
597-
includePaths: config.src.includes,
598-
fiber,
599-
}).on('error', sass.logError),
600-
),
618+
sass({
619+
importer: reactiumImporter,
620+
includePaths: config.src.includes,
621+
fiber,
622+
}).on('error', sass.logError),
601623
)
602-
.pipe(gulpif(isLess, less({ paths: config.src.includes })))
603624
.pipe(prefix(config.browsers))
604625
.pipe(gulpif(!isDev, cleanCSS()))
605626
.pipe(gulpif(isDev, sourcemaps.write()))
@@ -610,6 +631,7 @@ $assets: (
610631

611632
const styles = gulp.series(
612633
task('styles:colors'),
634+
task('styles:partials'),
613635
task('styles:pluginAssets'),
614636
task('styles:compile'),
615637
);
@@ -664,6 +686,7 @@ $assets: (
664686
sw,
665687
static: staticTask,
666688
'static:copy': staticCopy,
689+
'styles:partials': dddStylesPartial,
667690
'styles:pluginAssets': pluginAssets,
668691
'styles:colors': stylesColors,
669692
'styles:compile': stylesCompile,

‎docs/api_project.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ define({
88
"apidoc": "0.3.0",
99
"generator": {
1010
"name": "apidoc",
11-
"time": "2021-08-24T17:22:34.927Z",
11+
"time": "2021-08-30T19:24:17.151Z",
1212
"url": "https://apidocjs.com",
1313
"version": "0.25.0"
1414
}

‎docs/api_project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"apidoc": "0.3.0",
99
"generator": {
1010
"name": "apidoc",
11-
"time": "2021-08-24T17:22:34.927Z",
11+
"time": "2021-08-30T19:24:17.151Z",
1212
"url": "https://apidocjs.com",
1313
"version": "0.25.0"
1414
}

0 commit comments

Comments
 (0)