eslint upgrade base

add2cal · Sep 30, 2024 · 1b97d0d · 1b97d0d
1 parent 89bde6c
commit 1b97d0d
Show file tree

Hide file tree

Showing 15 changed files with 339 additions and 499 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/prettier.config.js → .prettierrc.mjs b/prettier.config.js → .prettierrc.mjs
@@ -1,10 +1,10 @@
-/* eslint-disable no-undef */
-// prettier.config.js or .prettierrc.js
-module.exports = {
+/** @type {import("prettier").Config} */
+export default {
   proseWrap: 'preserve',
   embeddedLanguageFormatting: 'off',
   useTabs: false,
   singleQuote: true,
+  trailingComma: 'all',
   arrowParens: 'always',
   printWidth: 300,
   endOfLine: 'lf',

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -198,7 +198,7 @@ module.exports = function (grunt) {
         dest: 'dist/commonjs/index.js',
         options: {
           stripBanners: true,
-          banner: "// eslint-disable-next-line @typescript-eslint/no-var-requires\r\nconst tzlibActions = require('timezones-ical-library');\r\n",
+          banner: "const tzlibActions = require('timezones-ical-library');\r\n",
           footer: 'module.exports = { atcb_action, i18nStrings, cssStyles: atcbCssTemplate, atcb_generate_ty, atcb_generate_timestring };',
           process: (content) => prepareFinalFile(content, true, true, true),
         },
@@ -208,7 +208,7 @@ module.exports = function (grunt) {
         dest: 'dist/commonjs/no-pro/index.js',
         options: {
           stripBanners: true,
-          banner: "// eslint-disable-next-line @typescript-eslint/no-var-requires\r\nconst tzlibActions = require('timezones-ical-library');\r\n",
+          banner: "const tzlibActions = require('timezones-ical-library');\r\n",
           footer: 'module.exports = { atcb_action, i18nStrings, cssStyles: atcbCssTemplate };',
           process: (content) => prepareFinalFile(content, true, true, true),
         },
@@ -218,7 +218,7 @@ module.exports = function (grunt) {
         dest: 'dist/commonjs/unstyle/index.js',
         options: {
           stripBanners: true,
-          banner: "// eslint-disable-next-line @typescript-eslint/no-var-requires\r\nconst tzlibActions = require('timezones-ical-library');\r\n",
+          banner: "const tzlibActions = require('timezones-ical-library');\r\n",
           footer: 'module.exports = { atcb_action, i18nStrings, atcb_generate_ty, atcb_generate_timestring };',
           process: (content) => prepareFinalFile(content, true, true, true, true),
         },
@@ -228,7 +228,7 @@ module.exports = function (grunt) {
         dest: 'dist/commonjs/no-pro-unstyle/index.js',
         options: {
           stripBanners: true,
-          banner: "// eslint-disable-next-line @typescript-eslint/no-var-requires\r\nconst tzlibActions = require('timezones-ical-library');\r\n",
+          banner: "const tzlibActions = require('timezones-ical-library');\r\n",
           footer: 'module.exports = { atcb_action, i18nStrings };',
           process: (content) => prepareFinalFile(content, true, true, true, true),
         },
@@ -255,12 +255,6 @@ module.exports = function (grunt) {
           done();
         },
       },
-      '.eslintrc.json commonJS': {
-        'dist/commonjs/.eslintrc.json': function (fs, fd, done) {
-          fs.writeSync(fd, '{ "extends": "../../.eslintrc.json", "env": { "node": true }, "plugins": ["commonjs"] }');
-          done();
-        },
-      },
     },
     // minify js files
     uglify: {
@@ -269,7 +263,6 @@ module.exports = function (grunt) {
         mangle: true,
         beautify: false,
         sourceMap: false,
-        banner: '/* eslint-disable @typescript-eslint/no-unused-vars */',
         output: {
           comments: 'some',
         },

diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -0,0 +1,32 @@
+import js from '@eslint/js';
+import prettierRecommended from 'eslint-plugin-prettier/recommended';
+import regexpEslint from 'eslint-plugin-regexp';
+import wcEslint from 'eslint-plugin-wc';
+
+export default [
+  // general ignores
+  {
+    ignores: ['**/*.d.ts', '**/*.min.*', 'dist/*', 'demo/*', 'Gruntfile.js', 'set-release.js', 'node_modules/', '.github/'],
+  },
+  // general rules
+  js.configs.recommended,
+  regexpEslint.configs['flat/recommended'],
+  wcEslint.configs['flat/recommended'],
+  prettierRecommended,
+  // overrides
+  {
+    files: ['**/*.{js,mjs,cjs}'],
+    rules: {
+      'prettier/prettier': 'error',
+      'no-mixed-spaces-and-tabs': ['error', 'smart-tabs'],
+      'no-undef': 'off',
+      'no-unused-vars': [
+        'warn',
+        {
+          argsIgnorePattern: '^_',
+          destructuredArrayIgnorePattern: '^_',
+        },
+      ],
+    },
+  },
+];