Skip to content
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.

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

feat: added sass support and removed less support #2348

Merged
merged 4 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ yarn-error.log*
yarn.lock
docs/_babel
lint.log
dist/bundles
docs/static/*.min.css
!docs/static/docs.min.css
.storybook/preview-head.html
.idea
.storybook-percy
AssistivTunnel
.sass-cache
1 change: 0 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ package-lock.json
docs.min.css.*
lint.log
docs
dist

15 changes: 4 additions & 11 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
const path = require("path");
console.log(`STORYBOOK_DS: ${process.env.STORYBOOK_DS}`);
module.exports = {
stories: ["../src/less/**/*.stories.js", "../src/less/**/stories/**/*.stories.js"],
stories: ["../src/sass/**/*.stories.js", "../src/sass/**/stories/**/*.stories.js"],
webpackFinal: async (config, {
configType
}) => {
config.module.rules.push({
test: /\.less/,
test: /\.scss/,
use: ["style-loader", "css-loader", {
loader: "postcss-loader",
options: {
Expand All @@ -17,14 +16,8 @@ module.exports = {
}
}
}, {
loader: "less-loader",
options: {
lessOptions: {
globalVars: {
ds: `ds${process.env.STORYBOOK_DS}`
}
}
}
loader: "sass-loader",
options: {}
}]
});
return config;
Expand Down
2 changes: 1 addition & 1 deletion .storybook/preview.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
import "../src/less/bundles/skin-full.less";
import "../src/sass/bundles/skin-full.scss";
40 changes: 16 additions & 24 deletions .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,19 @@
"stylelint-prettier/recommended"
],
"ignoreFiles": [
"dist/mixins/**/*",
"dist/**/*",
"dist/variables/**/*",
"**/*.min.css",
"**/*.js",
"**/*.less",
"**/*.svg"
],
"rules": {
"comment-empty-line-before": null,
"no-descending-specificity": null,
"no-duplicate-selectors": null,
"rule-empty-line-before": null,
"no-invalid-double-slash-comments": null,
"color-function-notation": "legacy",
"property-no-vendor-prefix": null,
"selector-no-vendor-prefix": null,
Expand All @@ -25,6 +27,8 @@
"declaration-block-no-redundant-longhand-properties": null,
"at-rule-empty-line-before": null,
"media-feature-range-notation": "prefix",
"media-query-no-invalid": null,
"at-rule-no-unknown": null,
"value-keyword-case": [
"lower",
{
Expand All @@ -43,36 +47,24 @@
"overrides": [
{
"files": [
"**/*.less"
"**/*.scss"
],
"extends": [
"stylelint-config-standard-scss",
"stylelint-config-prettier-scss"
],
"customSyntax": "postcss-less",
"plugins": [
"stylelint-order",
"stylelint-order"
],
"rules": {
"at-rule-no-unknown": [
true,
{
"ignoreAtRules": [
"icon-mixin"
]
}
],
"declaration-empty-line-before": null,
"function-no-unknown": [
true,
"scss/at-mixin-argumentless-call-parentheses": null,
"scss/dollar-variable-pattern": null,
"value-keyword-case": [
"lower",
{
"ignoreFunctions": [
"fade",
"shade",
"tint"
]
"camelCaseSvgKeywords": true
}
],
"media-query-no-invalid": null,
"no-descending-specificity": true,
"no-duplicate-selectors": true,
"order/properties-alphabetical-order": true
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ Once Jekyll is setup successfully, running a build should create the following f
- `./_site/static/common/docs.min.js`
- this is the Babel & Webpack output of `./docs/src/js/main.js`
- `./_site/static/dsx/docs.min.css`
- this is the LESS compiler output of `./docs/src/less/dsx.less`
- this is the SASS compiler output of `./docs/src/sass/dsx.less`
- `./_site/static/dsx/skin.min.css`
- the full, minified skin css bundle (only used in development environment)
- `./_site/index.html`
Expand Down
156 changes: 84 additions & 72 deletions dist/alert-dialog/alert-dialog.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions dist/alert-dialog/alert-dialog.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading