@1stg/eslint-config 5.3.1 → 5.4.2

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Change Log
 
+## 5.4.2
+
+### Patch Changes
+
+- [#133](https://github.com/1stG/configs/pull/133) [`9db70a5`](https://github.com/1stG/configs/commit/9db70a5dd136fbd6536b099863b5f617e4ffc29a) Thanks [@JounQin](https://github.com/JounQin)! - fix(eslint): incorrect prettier parser inferred for angular html files
+
+## 5.4.1
+
+### Patch Changes
+
+- [#131](https://github.com/1stG/configs/pull/131) [`1e06825`](https://github.com/1stG/configs/commit/1e068259c54b12751960dbdc8acaa07949134f0f) Thanks [@JounQin](https://github.com/JounQin)! - fix(eslint): disable prettier/prettier rule for md/mdx automatically
+
+## 5.4.0
+
+### Minor Changes
+
+- [#128](https://github.com/1stG/configs/pull/128) [`7228ebb`](https://github.com/1stG/configs/commit/7228ebb1d2a31b5a305258dff24b0d0ca357ad4f) Thanks [@JounQin](https://github.com/JounQin)! - feat: support `CONFIG_PREFER_PRETTIER` env
+
+### Patch Changes
+
+- Updated dependencies [[`7228ebb`](https://github.com/1stG/configs/commit/7228ebb1d2a31b5a305258dff24b0d0ca357ad4f)]:
+  - @1stg/config@0.2.0
+
 ## 5.3.1
 
 ### Patch Changes

package/_util.js

@@ -1,5 +1,6 @@
 const path = require('node:path')
 
+const { preferPrettier } = require('@1stg/config')
 const {
   isMonorepo,
   isPkgAvailable,
@@ -43,3 +44,7 @@ exports.magicNumbers = [
   -1, 0, 1, 2, 3, 5, 7, 10, 12, 15, 20, 24, 30, 31, 50, 60, 100, 365, 366, 500,
   768, 1000, 1024, 3600, 4200, 8080,
 ]
+
+exports.prettierExtends = preferPrettier
+  ? ['prettier']
+  : ['plugin:prettier/recommended']

package/base.js

@@ -1,7 +1,12 @@
 const { isTsAvailable } = require('@pkgr/utils')
 const { getGlobals } = require('eslint-plugin-mdx')
 
-const { isWebpackAvailable, magicNumbers, webpackSpecVars } = require('./_util')
+const {
+  isWebpackAvailable,
+  magicNumbers,
+  webpackSpecVars,
+  prettierExtends,
+} = require('./_util')
 
 module.exports = {
   extends: [
@@ -16,7 +21,7 @@ module.exports = {
     isTsAvailable && 'plugin:sonar/recommended',
     'plugin:unicorn/recommended',
     'standard',
-    'plugin:prettier/recommended',
+    ...prettierExtends,
   ].filter(Boolean),
   plugins: ['es-x', 'simple-import-sort'],
   globals: isWebpackAvailable ? getGlobals(webpackSpecVars) : undefined,

package/overrides.js

@@ -1,6 +1,6 @@
 const path = require('node:path')
 
-const { jsoncFiles, nonJsonRcFiles } = require('@1stg/config')
+const { jsoncFiles, nonJsonRcFiles, preferPrettier } = require('@1stg/config')
 const {
   isAngularAvailable,
   isReactAvailable,
@@ -12,7 +12,7 @@ const {
   tryPkg,
 } = require('@pkgr/utils')
 
-const { magicNumbers } = require('./_util')
+const { magicNumbers, prettierExtends } = require('./_util')
 
 const configFile =
   tryFile(path.resolve('babel.config.js')) ||
@@ -92,8 +92,7 @@ const tsBase = {
     'plugin:@typescript-eslint/eslint-recommended',
     'plugin:@typescript-eslint/recommended',
     'plugin:import/typescript',
-    // eslint-disable-next-line sonarjs/no-duplicate-string
-    'plugin:prettier/recommended',
+    ...prettierExtends,
   ],
   settings: resolveSettings,
   rules: {
@@ -271,11 +270,7 @@ exports.dTs = {
 }
 
 const reactJsx = {
-  extends: [
-    'standard-react',
-    'plugin:react/recommended',
-    'plugin:prettier/recommended',
-  ],
+  extends: ['standard-react', 'plugin:react/recommended', ...prettierExtends],
   settings: {
     react: {
       version: 'detect',
@@ -326,7 +321,7 @@ exports.reactTs = {
   },
 }
 
-const vueExtends = ['plugin:vue/recommended', 'plugin:prettier/recommended']
+const vueExtends = ['plugin:vue/recommended', ...prettierExtends]
 
 exports.vue = [
   {
@@ -369,7 +364,7 @@ const svelteBase = {
     'plugin:markup/recommended',
     'plugin:svelte/recommended',
     'plugin:svelte/prettier',
-    'plugin:prettier/recommended',
+    ...prettierExtends,
   ],
   rules: {
     'sonar/label-position': 0,
@@ -400,7 +395,7 @@ exports.angular = [
     extends: [
       'plugin:@angular-eslint/recommended',
       'plugin:@angular-eslint/template/process-inline-templates',
-      'plugin:prettier/recommended',
+      ...prettierExtends,
     ],
     rules: {
       '@angular-eslint/prefer-on-push-component-change-detection': 1,
@@ -411,7 +406,7 @@ exports.angular = [
     extends: [
       'plugin:@angular-eslint/template/recommended',
       'plugin:markup/recommended',
-      'plugin:prettier/recommended',
+      ...prettierExtends,
     ],
     parser: 'angular-eslint-template-parser',
     rules: {
@@ -421,6 +416,12 @@ exports.angular = [
           allowNullOrUndefined: true,
         },
       ],
+      'prettier/prettier': [
+        preferPrettier ? 0 : 2,
+        {
+          parser: 'angular',
+        },
+      ],
       'spaced-comment': 0,
     },
   },
@@ -438,7 +439,7 @@ exports.markup = [
     extends: 'plugin:markup/recommended',
     rules: {
       'prettier/prettier': [
-        2,
+        preferPrettier ? 0 : 2,
         {
           parser: 'html',
         },
@@ -447,13 +448,16 @@ exports.markup = [
   },
   {
     files: '*.pug',
-    extends: ['plugin:markup/recommended', 'plugin:prettier/recommended'],
+    extends: ['plugin:markup/recommended', ...prettierExtends],
   },
 ]
 
 exports.md = {
   files: '*.md',
   extends: ['plugin:mdx/recommended'],
+  rules: {
+    'prettier/prettier': preferPrettier ? 0 : 2,
+  },
 }
 
 exports.mdx = {
@@ -461,6 +465,9 @@ exports.mdx = {
   extends: [...reactJsx.extends, 'plugin:mdx/recommended'],
   parserOptions: jsBase.parserOptions,
   settings: { ...reactJsx.settings, ...resolveSettings },
+  rules: {
+    'prettier/prettier': preferPrettier ? 0 : 2,
+  },
 }
 
 const nonSourceRules = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1stg/eslint-config",
-  "version": "5.3.1",
+  "version": "5.4.2",
   "description": "Personal but Shareable ESLint Configuration for all 1stG.me projects",
   "repository": "git+https://github.com/1stG/configs.git",
   "homepage": "https://github.com/1stG/configs/tree/master/packages/eslint-config",
@@ -45,29 +45,29 @@
     "eslint": ">=6.0.0"
   },
   "dependencies": {
-    "@1stg/config": "^0.1.0",
-    "@angular-eslint/eslint-plugin": "^14.0.0",
-    "@angular-eslint/eslint-plugin-template": "^14.0.0",
-    "@angular-eslint/template-parser": "^14.0.0",
+    "@1stg/config": "^0.2.0",
+    "@angular-eslint/eslint-plugin": "^14.0.2",
+    "@angular-eslint/eslint-plugin-template": "^14.0.2",
+    "@angular-eslint/template-parser": "^14.0.2",
     "@babel/eslint-parser": "^7.18.2",
     "@babel/eslint-plugin": "^7.17.7",
     "@pkgr/utils": "^2.3.0",
-    "@typescript-eslint/eslint-plugin": "^5.30.5",
-    "@typescript-eslint/parser": "^5.30.5",
+    "@typescript-eslint/eslint-plugin": "^5.30.6",
+    "@typescript-eslint/parser": "^5.30.6",
     "angular-eslint-template-parser": "^0.1.1",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-config-standard-jsx": "^11.0.0",
     "eslint-config-standard-react": "^11.0.1",
     "eslint-formatter-friendly": "^7.0.0",
-    "eslint-import-resolver-typescript": "^3.2.4",
+    "eslint-import-resolver-typescript": "^3.2.5",
     "eslint-plugin-css": "^0.6.0",
     "eslint-plugin-es-x": "^5.2.1",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jest": "^26.5.3",
     "eslint-plugin-jsdoc": "^39.3.3",
-    "eslint-plugin-json-schema-validator": "^3.1.3",
+    "eslint-plugin-json-schema-validator": "^3.2.3",
     "eslint-plugin-jsonc": "^2.3.1",
     "eslint-plugin-markup": "^0.10.0",
     "eslint-plugin-mdx": "^2.0.1",