Skip to content

chore: Remove globbing from pfe-sass #1507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
castastrophe merged 3 commits into from
Apr 8, 2021
Merged

chore: Remove globbing from pfe-sass #1507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6727d50
chore: Remove globbing from pfe-sass
Mar 31, 2021
eabbaf4
Branch was auto-updated with the latest.
github-actions[bot] Apr 1, 2021
1bb20f4
Branch was auto-updated with the latest.
github-actions[bot] Apr 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 6 additions & 31 deletions elements/pfe-sass/gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ const {
} = require("gulp");

const pfelementPackage = require("./package.json");
const version = pfelementPackage.version;
const elementName = pfelementPackage.pfelement.elementName;
// const version = pfelementPackage.version;
// const elementName = pfelementPackage.pfelement.elementName;

const paths = {
source: "./",
Expand All @@ -18,56 +18,31 @@ const paths = {
};

const clean = require("gulp-clean");
const mergeStream = require("merge-stream");
const globSass = require("gulp-sass-globbing");
const sassdoc = require("sassdoc");

// Delete the temp directory
// Delete the demo assets
task("clean", () => {
return src(["__*.scss", "demo/*.html", "demo/assets"], {
return src(["demo/*.html", "demo/assets"], {
cwd: paths.compiled,
read: false,
allowEmpty: true
}).pipe(clean());
});

// Custom gulp for sass globbing
task("sass:globbing", () => {
let stream = mergeStream();
["extends", "functions", "maps", "mixins", "variables"].forEach(folder => {
stream.add(
src([
`${folder}/_*.scss`
// `!${folder}/_deprecated*.scss`,
])
.pipe(
globSass({
path: `__${folder}.scss`
}, {
signature: `// generated with sass globbing, v${version}`
})
)
.pipe(dest(paths.compiled))
);
});

return stream;
});

task("build:sassdoc", () => {
return src(["{extends,functions,maps,mixins,variables}/_*.scss", "pfe-sass.scss"], {
cwd: paths.compiled,
allowEmpty: true
}).pipe(sassdoc());
});

task("build", series("clean", parallel("build:sassdoc", "sass:globbing")));
task("build", series("clean", "build:sassdoc"));

task("watch", () => watch(
["{extends,functions,maps,mixins,variables}/_*.scss", "pfe-sass.scss"], {
cwd: paths.compiled
},
series("build")
series("build:sassdoc")
));

task("dev", parallel("build", "watch"));
Expand Down
30 changes: 25 additions & 5 deletions elements/pfe-sass/pfe-sass.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,28 @@
/// Documented using SassDoc format: http://sassdoc.com

@import "_variables";
@import "variables/1-definitions";
@import "variables/2-crayon";
@import "variables/3-colors";
@import "variables/4-sizes";

@import "@patternfly/patternfly/sass-utilities/functions";
@import "_functions";
@import "_maps";
@import "_mixins";
@import "_extends";
@import "functions/1-tools";
@import "functions/custom-properties";
@import "functions/general";

@import "maps/broadcasted";
@import "maps/colors";
@import "maps/general";
@import "maps/typography";
@import "maps/typography_deprecated";
@import "maps/zindex";

@import "mixins/components";
@import "mixins/containers";
@import "mixins/copy-mixins";
@import "mixins/custom-properties";
@import "mixins/mixins";

@import "extends/extends";
@import "extends/typography-deprecated";
@import "extends/typography_extends";
Loading