Merge pull request #1151 from bryceosterhaus/cssSupport

fix(npm-scripts): support formatting css files
liferay · Jul 18, 2023 · 9e81fd4 · 9e81fd4
2 parents aa90546 + 1aa8919
commit 9e81fd4
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/projects.yml b/.github/workflows/projects.yml
@@ -22,7 +22,7 @@ on:
 
 env:
     CI: true
-    yarn-cache-name: yarn-cache-11
+    yarn-cache-name: yarn-cache-20
     yarn-cache-path: .yarn
 
 jobs:

diff --git a/projects/npm-tools/packages/npm-scripts/src/config/npmscripts.config.js b/projects/npm-tools/packages/npm-scripts/src/config/npmscripts.config.js
@@ -8,7 +8,7 @@ const path = require('path');
 const CHECK_AND_FIX_GLOBS = [
 	'**/*.{html,js,jsx,css,scss,ts,tsx}',
 	'/*.{js,ts}',
-	'/{dev,extra,src,test}/**/*.{js,scss,ts,tsx}',
+	'/{dev,extra,src,test}/**/*.{html,js,jsx,css,scss,ts,tsx}',
 	'/src/**/*.{jsp,jspf}',
 ];
 

diff --git a/projects/npm-tools/packages/npm-scripts/src/config/stylelint.json b/projects/npm-tools/packages/npm-scripts/src/config/stylelint.json
@@ -51,7 +51,12 @@
 			}
 		],
 		"selector-pseudo-class-no-unknown": true,
-		"selector-pseudo-element-no-unknown": true,
+		"selector-pseudo-element-no-unknown": [
+			true,
+			{
+				"ignorePseudoElements": ["ng-deep"]
+			}
+		],
 		"selector-type-no-unknown": true,
 		"shorthand-property-no-redundant-values": true,
 		"unit-case": "lower",

diff --git a/projects/npm-tools/packages/npm-scripts/src/scripts/format.js b/projects/npm-tools/packages/npm-scripts/src/scripts/format.js
@@ -22,6 +22,7 @@ const DEFAULT_OPTIONS = {
  * File extensions that we allow Prettier to process.
  */
 const EXTENSIONS = [
+	'.css',
 	'.js',
 	'.json',
 	'.jsp',

diff --git a/projects/npm-tools/packages/npm-scripts/src/scripts/lint.js b/projects/npm-tools/packages/npm-scripts/src/scripts/lint.js
@@ -32,6 +32,7 @@ const DEFAULT_OPTIONS = {
  * - via stylelint (natively).
  */
 const EXTENSIONS = {
+	css: ['.css'],
 	js: ['.js', '.ts', '.tsx'],
 	jsp: ['.jsp', '.jspf'],
 	scss: ['.scss'],

diff --git a/projects/npm-tools/packages/npm-scripts/src/scripts/lint/stylelint/isSCSS.js b/projects/npm-tools/packages/npm-scripts/src/scripts/lint/stylelint/isSCSS.js
@@ -5,7 +5,7 @@
 
 const hasExtension = require('../../../utils/hasExtension');
 
-const EXTENSIONS = new Set(['.scss']);
+const EXTENSIONS = new Set(['.css', '.scss']);
 
 function isSCSS(filePath) {
 	return hasExtension(filePath, EXTENSIONS);

diff --git a/projects/npm-tools/packages/npm-scripts/src/scripts/lint/stylelint/lintSCSS.js b/projects/npm-tools/packages/npm-scripts/src/scripts/lint/stylelint/lintSCSS.js
@@ -48,7 +48,7 @@ async function lintSCSS(source, onReport, options = {}) {
 
 		fix,
 
-		syntax: 'scss',
+		syntax: path.extname(filePath).replace('.', ''),
 	});
 
 	results.forEach((result) => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ const DEFAULT_OPTIONS = { @@
      * File extensions that we allow Prettier to process.
      */
     const EXTENSIONS = [
+    	'.css',
     	'.js',
     	'.json',
     	'.jsp',
@@ Expand Down @@