Skip to content

Commit 97d1343

Browse files
authored
Merge pull request #12333 from IgniteUI/simeonoff/merge-sassdocs
build(sassdoc): merge theming and local sass
2 parents b08e01c + 0c7ad50 commit 97d1343

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

gulpfile.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,10 @@ function typedocBuildDocsEN(cb) {
248248
}
249249

250250
const SASSDOC = {
251-
PROJECT_PATH: path.join(__dirname, 'projects', 'igniteui-angular', 'src', 'lib', 'core', 'styles'),
251+
PROJECT_PATHS: [
252+
`${path.join(__dirname, 'projects', 'igniteui-angular', 'src', 'lib', 'core', 'styles')}/**/*.scss`,
253+
`${path.join(__dirname, 'node_modules', 'igniteui-theming', 'sass')}/**/*.scss`
254+
],
252255
DEST: path.join(DOCS_OUTPUT_PATH, 'sass'),
253256
OPTIONS: path.join(__dirname, '.sassdocrc'),
254257
};
@@ -266,7 +269,7 @@ function sassdocBuildJson(cb) {
266269
options.convert = convert;
267270
options.exportDir = exportDir;
268271

269-
gulp.src(`${SASSDOC.PROJECT_PATH}/**/*.scss`)
272+
gulp.src(SASSDOC.PROJECT_PATHS)
270273
.pipe(sassdoc(options));
271274

272275
cb();
@@ -282,7 +285,7 @@ function sassdocImportJson(cb) {
282285
options.json_dir = importDir;
283286
options.shellStringsPath = path.join(__dirname, 'extras', 'template', 'strings', 'shell-strings.json');
284287

285-
gulp.src(`${SASSDOC.PROJECT_PATH}/**/*.scss`)
288+
gulp.src(SASSDOC.PROJECT_PATHS)
286289
.pipe(sassdoc(options));
287290

288291
cb();
@@ -297,7 +300,7 @@ function sassdocBuildJA(cb) {
297300
options.json_dir = pathTranslations;
298301
options.shellStringsPath = path.join(__dirname, 'extras', 'template', 'strings', 'shell-strings.json');
299302

300-
gulp.src(`${SASSDOC.PROJECT_PATH}/**/*.scss`)
303+
gulp.src(SASSDOC.PROJECT_PATHS)
301304
.pipe(sassdoc(options));
302305

303306
cb();
@@ -309,7 +312,7 @@ function sassdocBuildEN(cb) {
309312
options.lang = 'en';
310313
options.shellStringsPath = path.join(__dirname, 'extras', 'template', 'strings', 'shell-strings.json');
311314

312-
gulp.src(`${SASSDOC.PROJECT_PATH}/**/*.scss`)
315+
gulp.src(SASSDOC.PROJECT_PATHS)
313316
.pipe(sassdoc(options));
314317

315318
cb();

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
"hammer-simulator": "0.0.1",
115115
"ig-typedoc-theme": "^4.2.0",
116116
"igniteui-sassdoc-theme": "^1.1.4",
117-
"igniteui-theming": "^1.1.2",
117+
"igniteui-theming": "^1.1.4",
118118
"igniteui-webcomponents": "^4.0.0",
119119
"jasmine": "^4.5.0",
120120
"jasmine-core": "~4.5.0",
@@ -128,7 +128,7 @@
128128
"postcss-scss": "^4.0.3",
129129
"sass": "^1.56.0",
130130
"sass-true": "^6.0.1",
131-
"sassdoc": "^2.7.3",
131+
"sassdoc": "^2.7.4",
132132
"sassdoc-plugin-localization": "^1.4.3",
133133
"stylelint": "^14.15.0",
134134
"stylelint-scss": "^4.1.0",

0 commit comments

Comments
 (0)