@1stg/eslint-config 5.3.0 → 5.3.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 5.3.1
+
+### Patch Changes
+
+- [#126](https://github.com/1stG/configs/pull/126) [`48d7542`](https://github.com/1stG/configs/commit/48d754293d6d68094792df71d56e8d7e8fc088a8) Thanks [@JounQin](https://github.com/JounQin)! - fix: support more `markup` files
+
 ## 5.3.0
 
 ### Minor Changes

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 1stG
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/overrides.js

@@ -92,7 +92,8 @@ const tsBase = {
     'plugin:@typescript-eslint/eslint-recommended',
     'plugin:@typescript-eslint/recommended',
     'plugin:import/typescript',
-    'prettier',
+    // eslint-disable-next-line sonarjs/no-duplicate-string
+    'plugin:prettier/recommended',
   ],
   settings: resolveSettings,
   rules: {
@@ -270,7 +271,11 @@ exports.dTs = {
 }
 
 const reactJsx = {
-  extends: ['standard-react', 'plugin:react/recommended', 'prettier'],
+  extends: [
+    'standard-react',
+    'plugin:react/recommended',
+    'plugin:prettier/recommended',
+  ],
   settings: {
     react: {
       version: 'detect',
@@ -321,7 +326,7 @@ exports.reactTs = {
   },
 }
 
-const vueExtends = ['plugin:vue/recommended', 'prettier']
+const vueExtends = ['plugin:vue/recommended', 'plugin:prettier/recommended']
 
 exports.vue = [
   {
@@ -346,6 +351,11 @@ exports.vue = [
   },
   {
     files: '*.vue',
+    extends: [
+      // eslint-disable-next-line sonarjs/no-duplicate-string
+      'plugin:markup/recommended',
+      ...vueExtends,
+    ],
     rules: {
       'no-unused-vars': 0,
       '@typescript-eslint/no-unused-vars': 0,
@@ -356,6 +366,7 @@ exports.vue = [
 const svelteBase = {
   files: '*.svelte',
   extends: [
+    'plugin:markup/recommended',
     'plugin:svelte/recommended',
     'plugin:svelte/prettier',
     'plugin:prettier/recommended',
@@ -389,7 +400,7 @@ exports.angular = [
     extends: [
       'plugin:@angular-eslint/recommended',
       'plugin:@angular-eslint/template/process-inline-templates',
-      'prettier',
+      'plugin:prettier/recommended',
     ],
     rules: {
       '@angular-eslint/prefer-on-push-component-change-detection': 1,
@@ -400,6 +411,7 @@ exports.angular = [
     extends: [
       'plugin:@angular-eslint/template/recommended',
       'plugin:markup/recommended',
+      'plugin:prettier/recommended',
     ],
     parser: 'angular-eslint-template-parser',
     rules: {
@@ -409,44 +421,36 @@ exports.angular = [
           allowNullOrUndefined: true,
         },
       ],
-      'prettier/prettier': 0,
       'spaced-comment': 0,
     },
   },
+  {
+    files: '*inline-template-*.component.html',
+    rules: {
+      'unicorn/no-empty-file': 0,
+    },
+  },
+]
+
+exports.markup = [
   {
     files: '*.html',
-    excludedFiles: '*inline-template-*.component.html',
-    extends: ['prettier'],
+    extends: 'plugin:markup/recommended',
     rules: {
       'prettier/prettier': [
         2,
         {
-          parser: 'angular',
+          parser: 'html',
         },
       ],
     },
   },
   {
-    files: '*inline-template-*.component.html',
-    rules: {
-      'unicorn/no-empty-file': 0,
-    },
+    files: '*.pug',
+    extends: ['plugin:markup/recommended', 'plugin:prettier/recommended'],
   },
 ]
 
-exports.html = {
-  files: '*.html',
-  extends: 'plugin:markup/recommended',
-  rules: {
-    'prettier/prettier': [
-      2,
-      {
-        parser: 'html',
-      },
-    ],
-  },
-}
-
 exports.md = {
   files: '*.md',
   extends: ['plugin:mdx/recommended'],
@@ -546,9 +550,11 @@ exports.overrides = []
     isReactAvailable && exports.react,
     isReactAvailable && exports.reactHooks,
     isReactAvailable && exports.reactTs,
+    // The order matters, the later should to be preferred
+    exports.markup,
+    isAngularAvailable && exports.angular,
     isVueAvailable && exports.vue,
     isSvelteAvailable && exports.svelte,
-    isAngularAvailable ? exports.angular : exports.html,
     exports.md,
     exports.mdx,
     isPkgAvailable('jest') && exports.jest,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1stg/eslint-config",
-  "version": "5.3.0",
+  "version": "5.3.1",
   "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",
@@ -82,11 +82,11 @@
     "eslint-plugin-sonarjs": "^0.13.0",
     "eslint-plugin-svelte": "^2.2.0",
     "eslint-plugin-toml": "^0.3.1",
-    "eslint-plugin-unicorn": "^43.0.0",
+    "eslint-plugin-unicorn": "^43.0.1",
     "eslint-plugin-vue": "^9.2.0",
     "eslint-plugin-yml": "^1.0.0"
   },
   "publishConfig": {
     "access": "public"
   }
-}
+}