diff --git a/.stylelintrc b/.stylelintrc
index b39496a7a75..fa796e445ce 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -30,15 +30,6 @@
],
}
],
- "block-closing-brace-newline-after": [
- "always",
- {
- "ignoreAtRules": [
- "if",
- "else"
- ],
- }
- ],
"color-function-notation": null,
"declaration-colon-newline-after": null,
"function-disallowed-list": [
@@ -68,6 +59,7 @@
]
}
],
+ "scss/dollar-variable-colon-space-after": "always-single-line",
"scss/dollar-variable-pattern": null,
"scss/no-global-function-names": null,
"selector-class-pattern": "^([a-zA-Z][a-zA-Z0-9]*)([-[a-zA-Z0-9]+|--[a-zA-Z0-9]+])*$",
@@ -77,4 +69,4 @@
"value-list-comma-newline-after": null,
"selector-not-notation": "simple"
}
-}
\ No newline at end of file
+}
diff --git a/bin/regenerate_font.js b/bin/regenerate_font.js
index 166948abe75..5443dda892b 100755
--- a/bin/regenerate_font.js
+++ b/bin/regenerate_font.js
@@ -13,7 +13,7 @@ function getUnicodeRangeFromFile(file) {
}
function regenerateFonts() {
- import('characterset').then((characterset) => {
+ import('characterset').then(async (characterset) => {
const CharacterSet = characterset.default;
@@ -90,12 +90,12 @@ function regenerateFonts() {
unicode-range: ${characterSetFromFile.toHexRangeString()};
}
`;
- const runPrettierWithConfig = (text) => {
- const filePath = prettier.resolveConfigFile.sync();
- const options = prettier.resolveConfig.sync(filePath);
+ const runPrettierWithConfig = async (text) => {
+ const filePath = await prettier.resolveConfigFile();
+ const options = await prettier.resolveConfig(filePath);
return prettier.format(text, { ...options, parser: 'scss' });
};
- fs.writeFileSync(`src/fonts/${cssFile}`, runPrettierWithConfig(cssContents));
+ fs.writeFileSync(`src/fonts/${cssFile}`, await runPrettierWithConfig(cssContents));
console.info('Generating html...');
const htmlContents = `