Browse Source

chore: update eslint to v9 (#3367)

* chore: update eslint to v9

* remove compat

* pin typescript
Tony Brix 1 year ago
parent
commit
62b941d417
11 changed files with 644 additions and 424 deletions
  1. 0 3
      .eslintignore
  2. 0 33
      .eslintrc.json
  3. 0 1
      bin/main.js
  4. 2 2
      docs/demo/demo.js
  5. 1 1
      docs/demo/worker.js
  6. 256 0
      eslint-config-standard.js
  7. 58 0
      eslint.config.js
  8. 303 358
      package-lock.json
  9. 22 24
      package.json
  10. 1 1
      src/helpers.ts
  11. 1 1
      test/specs/redos/cubic_def.cjs

+ 0 - 3
.eslintignore

@@ -1,3 +0,0 @@
-lib
-*.min.js
-public

+ 0 - 33
.eslintrc.json

@@ -1,33 +0,0 @@
-{
-  "extends": ["standard", "plugin:@typescript-eslint/recommended"],
-  "parser": "@typescript-eslint/parser",
-  "plugins": ["@typescript-eslint"],
-  "root": true,
-  "rules": {
-    "semi": ["error", "always"],
-    "indent": ["error", 2, {
-      "SwitchCase": 1,
-      "VariableDeclarator": { "var": 2 },
-      "outerIIFEBody": 0
-    }],
-    "operator-linebreak": ["error", "before", { "overrides": { "=": "after" } }],
-    "space-before-function-paren": ["error", "never"],
-    "no-cond-assign": "off",
-    "no-useless-escape": "off",
-    "one-var": "off",
-    "no-control-regex": "off",
-    "no-prototype-builtins": "off",
-    "no-extra-semi": "error",
-    "prefer-const": "error",
-    "no-var": "error",
-    "@typescript-eslint/ban-ts-comment": "off",
-    "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-non-null-assertion": "off",
-    "@typescript-eslint/no-empty-function": "off",
-    "@typescript-eslint/no-namespace": "off",
-    "@typescript-eslint/no-unused-vars":  ["error", { "args": "none" }]
-  },
-  "env": {
-    "node": true
-  }
-}

+ 0 - 1
bin/main.js

@@ -34,7 +34,6 @@ export async function main(nodeProcess) {
     const __dirname = dirname(fileURLToPath(import.meta.url));
     const __dirname = dirname(fileURLToPath(import.meta.url));
     const helpText = await readFile(resolve(__dirname, '../man/marked.1.md'), 'utf8');
     const helpText = await readFile(resolve(__dirname, '../man/marked.1.md'), 'utf8');
 
 
-    // eslint-disable-next-line promise/param-names
     await new Promise(res => {
     await new Promise(res => {
       spawn('man', [resolve(__dirname, '../man/marked.1')], options)
       spawn('man', [resolve(__dirname, '../man/marked.1')], options)
         .on('error', () => {
         .on('error', () => {

+ 2 - 2
docs/demo/demo.js

@@ -268,7 +268,7 @@ function checkForChanges() {
       const newOptions = JSON.parse(optionsString);
       const newOptions = JSON.parse(optionsString);
       options = newOptions;
       options = newOptions;
       $optionsElem.classList.remove('error');
       $optionsElem.classList.remove('error');
-    } catch (err) {
+    } catch {
       $optionsElem.classList.add('error');
       $optionsElem.classList.add('error');
     }
     }
 
 
@@ -312,7 +312,7 @@ function setResponseTime(ms) {
 function setParsed(parsed, lexed) {
 function setParsed(parsed, lexed) {
   try {
   try {
     $previewIframe.contentDocument.body.innerHTML = parsed;
     $previewIframe.contentDocument.body.innerHTML = parsed;
-  } catch (ex) {}
+  } catch {}
   $htmlElem.value = parsed;
   $htmlElem.value = parsed;
   $lexerElem.value = lexed;
   $lexerElem.value = lexed;
 }
 }

+ 1 - 1
docs/demo/worker.js

@@ -120,7 +120,7 @@ function fetchMarked(file) {
         try {
         try {
           // eslint-disable-next-line no-new-func
           // eslint-disable-next-line no-new-func
           Function(text)();
           Function(text)();
-        } catch (err) {
+        } catch {
           throw new Error(`Cannot find ${file}`);
           throw new Error(`Cannot find ${file}`);
         }
         }
         const marked = g.marked || g.module.exports;
         const marked = g.marked || g.module.exports;

+ 256 - 0
eslint-config-standard.js

@@ -0,0 +1,256 @@
+/*! eslint-config-standard. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
+
+import pluginN from 'eslint-plugin-n';
+import globals from 'globals';
+
+const config = {
+  languageOptions: {
+    ecmaVersion: 2022,
+    sourceType: 'module',
+
+    parserOptions: {
+      ecmaFeatures: { jsx: true }
+    },
+
+    globals: {
+      ...globals.es2021,
+      ...globals.node,
+      document: 'readonly',
+      navigator: 'readonly',
+      window: 'readonly'
+    }
+  },
+
+  plugins: {
+    n: pluginN
+  },
+
+  rules: {
+    'no-var': 'warn',
+    'object-shorthand': ['warn', 'properties'],
+
+    'accessor-pairs': ['error', { setWithoutGet: true, enforceForClassMembers: true }],
+    'array-bracket-spacing': ['error', 'never'],
+    'array-callback-return': ['error', {
+      allowImplicit: false,
+      checkForEach: false
+    }],
+    'arrow-spacing': ['error', { before: true, after: true }],
+    'block-spacing': ['error', 'always'],
+    'brace-style': ['error', '1tbs', { allowSingleLine: true }],
+    camelcase: ['error', {
+      allow: ['^UNSAFE_'],
+      properties: 'never',
+      ignoreGlobals: true
+    }],
+    'comma-dangle': ['error', {
+      arrays: 'never',
+      objects: 'never',
+      imports: 'never',
+      exports: 'never',
+      functions: 'never'
+    }],
+    'comma-spacing': ['error', { before: false, after: true }],
+    'comma-style': ['error', 'last'],
+    'computed-property-spacing': ['error', 'never', { enforceForClassMembers: true }],
+    'constructor-super': 'error',
+    curly: ['error', 'multi-line'],
+    'default-case-last': 'error',
+    'dot-location': ['error', 'property'],
+    'dot-notation': ['error', { allowKeywords: true }],
+    'eol-last': 'error',
+    eqeqeq: ['error', 'always', { null: 'ignore' }],
+    'func-call-spacing': ['error', 'never'],
+    'generator-star-spacing': ['error', { before: true, after: true }],
+    indent: ['error', 2, {
+      SwitchCase: 1,
+      VariableDeclarator: 1,
+      outerIIFEBody: 1,
+      MemberExpression: 1,
+      FunctionDeclaration: { parameters: 1, body: 1 },
+      FunctionExpression: { parameters: 1, body: 1 },
+      CallExpression: { arguments: 1 },
+      ArrayExpression: 1,
+      ObjectExpression: 1,
+      ImportDeclaration: 1,
+      flatTernaryExpressions: false,
+      ignoreComments: false,
+      ignoredNodes: [
+        'TemplateLiteral *',
+        'JSXElement',
+        'JSXElement > *',
+        'JSXAttribute',
+        'JSXIdentifier',
+        'JSXNamespacedName',
+        'JSXMemberExpression',
+        'JSXSpreadAttribute',
+        'JSXExpressionContainer',
+        'JSXOpeningElement',
+        'JSXClosingElement',
+        'JSXFragment',
+        'JSXOpeningFragment',
+        'JSXClosingFragment',
+        'JSXText',
+        'JSXEmptyExpression',
+        'JSXSpreadChild'
+      ],
+      offsetTernaryExpressions: true
+    }],
+    'key-spacing': ['error', { beforeColon: false, afterColon: true }],
+    'keyword-spacing': ['error', { before: true, after: true }],
+    'lines-between-class-members': ['error', 'always', { exceptAfterSingleLine: true }],
+    'multiline-ternary': ['error', 'always-multiline'],
+    'new-cap': ['error', { newIsCap: true, capIsNew: false, properties: true }],
+    'new-parens': 'error',
+    'no-array-constructor': 'error',
+    'no-async-promise-executor': 'error',
+    'no-caller': 'error',
+    'no-case-declarations': 'error',
+    'no-class-assign': 'error',
+    'no-compare-neg-zero': 'error',
+    'no-cond-assign': 'error',
+    'no-const-assign': 'error',
+    'no-constant-condition': ['error', { checkLoops: false }],
+    'no-control-regex': 'error',
+    'no-debugger': 'error',
+    'no-delete-var': 'error',
+    'no-dupe-args': 'error',
+    'no-dupe-class-members': 'error',
+    'no-dupe-keys': 'error',
+    'no-duplicate-case': 'error',
+    'no-useless-backreference': 'error',
+    'no-empty': ['error', { allowEmptyCatch: true }],
+    'no-empty-character-class': 'error',
+    'no-empty-pattern': 'error',
+    'no-eval': 'error',
+    'no-ex-assign': 'error',
+    'no-extend-native': 'error',
+    'no-extra-bind': 'error',
+    'no-extra-boolean-cast': 'error',
+    'no-extra-parens': ['error', 'functions'],
+    'no-fallthrough': 'error',
+    'no-floating-decimal': 'error',
+    'no-func-assign': 'error',
+    'no-global-assign': 'error',
+    'no-implied-eval': 'error',
+    'no-import-assign': 'error',
+    'no-invalid-regexp': 'error',
+    'no-irregular-whitespace': 'error',
+    'no-iterator': 'error',
+    'no-labels': ['error', { allowLoop: false, allowSwitch: false }],
+    'no-lone-blocks': 'error',
+    'no-loss-of-precision': 'error',
+    'no-misleading-character-class': 'error',
+    'no-prototype-builtins': 'error',
+    'no-useless-catch': 'error',
+    'no-mixed-operators': ['error', {
+      groups: [
+        ['==', '!=', '===', '!==', '>', '>=', '<', '<='],
+        ['&&', '||'],
+        ['in', 'instanceof']
+      ],
+      allowSamePrecedence: true
+    }],
+    'no-mixed-spaces-and-tabs': 'error',
+    'no-multi-spaces': 'error',
+    'no-multi-str': 'error',
+    'no-multiple-empty-lines': ['error', { max: 1, maxBOF: 0, maxEOF: 0 }],
+    'no-new': 'error',
+    'no-new-func': 'error',
+    'no-new-object': 'error',
+    'no-new-symbol': 'error',
+    'no-new-wrappers': 'error',
+    'no-obj-calls': 'error',
+    'no-octal': 'error',
+    'no-octal-escape': 'error',
+    'no-proto': 'error',
+    'no-redeclare': ['error', { builtinGlobals: false }],
+    'no-regex-spaces': 'error',
+    'no-return-assign': ['error', 'except-parens'],
+    'no-self-assign': ['error', { props: true }],
+    'no-self-compare': 'error',
+    'no-sequences': 'error',
+    'no-shadow-restricted-names': 'error',
+    'no-sparse-arrays': 'error',
+    'no-tabs': 'error',
+    'no-template-curly-in-string': 'error',
+    'no-this-before-super': 'error',
+    'no-throw-literal': 'error',
+    'no-trailing-spaces': 'error',
+    'no-undef': 'error',
+    'no-undef-init': 'error',
+    'no-unexpected-multiline': 'error',
+    'no-unmodified-loop-condition': 'error',
+    'no-unneeded-ternary': ['error', { defaultAssignment: false }],
+    'no-unreachable': 'error',
+    'no-unreachable-loop': 'error',
+    'no-unsafe-finally': 'error',
+    'no-unsafe-negation': 'error',
+    'no-unused-expressions': ['error', {
+      allowShortCircuit: true,
+      allowTernary: true,
+      allowTaggedTemplates: true
+    }],
+    'no-unused-vars': ['error', {
+      args: 'none',
+      caughtErrors: 'none',
+      ignoreRestSiblings: true,
+      vars: 'all'
+    }],
+    'no-use-before-define': ['error', { functions: false, classes: false, variables: false }],
+    'no-useless-call': 'error',
+    'no-useless-computed-key': 'error',
+    'no-useless-constructor': 'error',
+    'no-useless-escape': 'error',
+    'no-useless-rename': 'error',
+    'no-useless-return': 'error',
+    'no-void': 'error',
+    'no-whitespace-before-property': 'error',
+    'no-with': 'error',
+    'object-curly-newline': ['error', { multiline: true, consistent: true }],
+    'object-curly-spacing': ['error', 'always'],
+    'object-property-newline': ['error', { allowMultiplePropertiesPerLine: true }],
+    'one-var': ['error', { initialized: 'never' }],
+    'operator-linebreak': ['error', 'after', { overrides: { '?': 'before', ':': 'before', '|>': 'before' } }],
+    'padded-blocks': ['error', { blocks: 'never', switches: 'never', classes: 'never' }],
+    'prefer-const': ['error', { destructuring: 'all' }],
+    'prefer-promise-reject-errors': 'error',
+    'prefer-regex-literals': ['error', { disallowRedundantWrapping: true }],
+    'quote-props': ['error', 'as-needed'],
+    quotes: ['error', 'single', { avoidEscape: true, allowTemplateLiterals: false }],
+    'rest-spread-spacing': ['error', 'never'],
+    semi: ['error', 'never'],
+    'semi-spacing': ['error', { before: false, after: true }],
+    'space-before-blocks': ['error', 'always'],
+    'space-before-function-paren': ['error', 'always'],
+    'space-in-parens': ['error', 'never'],
+    'space-infix-ops': 'error',
+    'space-unary-ops': ['error', { words: true, nonwords: false }],
+    'spaced-comment': ['error', 'always', {
+      line: { markers: ['*package', '!', '/', ',', '='] },
+      block: { balanced: true, markers: ['*package', '!', ',', ':', '::', 'flow-include'], exceptions: ['*'] }
+    }],
+    'symbol-description': 'error',
+    'template-curly-spacing': ['error', 'never'],
+    'template-tag-spacing': ['error', 'never'],
+    'unicode-bom': ['error', 'never'],
+    'use-isnan': ['error', {
+      enforceForSwitchCase: true,
+      enforceForIndexOf: true
+    }],
+    'valid-typeof': ['error', { requireStringLiterals: true }],
+    'wrap-iife': ['error', 'any', { functionPrototypeMethods: true }],
+    'yield-star-spacing': ['error', 'both'],
+    yoda: ['error', 'never'],
+
+    'n/handle-callback-err': ['error', '^(err|error)$'],
+    'n/no-callback-literal': 'error',
+    'n/no-deprecated-api': 'error',
+    'n/no-exports-assign': 'error',
+    'n/no-new-require': 'error',
+    'n/no-path-concat': 'error',
+    'n/process-exit-as-throw': 'error'
+  }
+};
+
+export default config;

+ 58 - 0
eslint.config.js

@@ -0,0 +1,58 @@
+import globals from 'globals';
+import standardConfig from './eslint-config-standard.js';
+import tseslint from 'typescript-eslint';
+
+export default [
+  {
+    ignores: ['**/lib', '**/*.min.js', '**/public']
+  },
+  standardConfig,
+  ...tseslint.configs.recommended,
+  {
+    languageOptions: {
+      globals: {
+        ...globals.node,
+        ...globals.browser
+      }
+    },
+
+    rules: {
+      semi: ['error', 'always'],
+
+      indent: ['error', 2, {
+        SwitchCase: 1,
+
+        VariableDeclarator: {
+          var: 2
+        },
+
+        outerIIFEBody: 0
+      }],
+
+      'operator-linebreak': ['error', 'before', {
+        overrides: {
+          '=': 'after'
+        }
+      }],
+
+      'space-before-function-paren': ['error', 'never'],
+      'no-cond-assign': 'off',
+      'no-useless-escape': 'off',
+      'one-var': 'off',
+      'no-control-regex': 'off',
+      'no-prototype-builtins': 'off',
+      'no-extra-semi': 'error',
+      'prefer-const': 'error',
+      'no-var': 'error',
+      '@typescript-eslint/ban-ts-comment': 'off',
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-non-null-assertion': 'off',
+      '@typescript-eslint/no-empty-function': 'off',
+      '@typescript-eslint/no-namespace': 'off',
+
+      '@typescript-eslint/no-unused-vars': ['error', {
+        args: 'none'
+      }]
+    }
+  }
+];

File diff suppressed because it is too large
+ 303 - 358
package-lock.json


+ 22 - 24
package.json

@@ -62,17 +62,13 @@
     "@semantic-release/github": "^10.1.0",
     "@semantic-release/github": "^10.1.0",
     "@semantic-release/npm": "^12.0.1",
     "@semantic-release/npm": "^12.0.1",
     "@semantic-release/release-notes-generator": "^14.0.1",
     "@semantic-release/release-notes-generator": "^14.0.1",
-    "@typescript-eslint/eslint-plugin": "^7.15.0",
-    "@typescript-eslint/parser": "^7.14.1",
     "cheerio": "1.0.0-rc.12",
     "cheerio": "1.0.0-rc.12",
     "commonmark": "0.31.0",
     "commonmark": "0.31.0",
     "cross-env": "^7.0.3",
     "cross-env": "^7.0.3",
     "dts-bundle-generator": "^9.5.1",
     "dts-bundle-generator": "^9.5.1",
-    "eslint": "^8.57.0",
-    "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-n": "^16.6.2",
-    "eslint-plugin-promise": "^6.4.0",
+    "eslint": "^9.7.0",
+    "eslint-plugin-n": "^17.9.0",
+    "globals": "^15.8.0",
     "highlight.js": "^11.10.0",
     "highlight.js": "^11.10.0",
     "markdown-it": "14.1.0",
     "markdown-it": "14.1.0",
     "marked-highlight": "^2.1.3",
     "marked-highlight": "^2.1.3",
@@ -83,30 +79,32 @@
     "semantic-release": "^24.0.0",
     "semantic-release": "^24.0.0",
     "titleize": "^4.0.0",
     "titleize": "^4.0.0",
     "ts-expect": "^1.3.0",
     "ts-expect": "^1.3.0",
-    "typescript": "5.5.2"
+    "tslib": "^2.6.3",
+    "typescript": "5.5.2",
+    "typescript-eslint": "8.0.0-alpha.41"
   },
   },
   "scripts": {
   "scripts": {
+    "bench": "npm run build && node test/bench.js",
+    "build": "npm run rollup && npm run build:types && npm run build:man",
+    "build:docs": "npm run build && node docs/build.js",
+    "build:man": "marked-man man/marked.1.md > man/marked.1",
+    "build:reset": "git checkout upstream/master lib/marked.cjs lib/marked.umd.js lib/marked.esm.js marked.min.js",
+    "build:types": "tsc && dts-bundle-generator --project tsconfig.json -o lib/marked.d.ts src/marked.ts && dts-bundle-generator --project tsconfig.json -o lib/marked.d.cts src/marked.ts",
+    "lint": "eslint --fix",
+    "rollup": "rollup -c rollup.config.js",
+    "rules": "node test/rules.js",
     "test": "npm run build && npm run test:specs && npm run test:unit",
     "test": "npm run build && npm run test:specs && npm run test:unit",
-    "test:only": "npm run build && npm run test:specs:only && npm run test:unit:only",
     "test:all": "npm test && npm run test:umd && npm run test:types && npm run test:lint",
     "test:all": "npm test && npm run test:umd && npm run test:types && npm run test:lint",
-    "test:unit": "node --test --test-reporter=spec test/unit/*.test.js",
-    "test:unit:only": "node --test --test-only --test-reporter=spec test/unit/*.test.js",
-    "test:specs": "node --test --test-reporter=spec test/run-spec-tests.js",
-    "test:specs:only": "node --test --test-only --test-reporter=spec test/run-spec-tests.js",
-    "test:lint": "eslint .",
+    "test:lint": "eslint",
+    "test:only": "npm run build && npm run test:specs:only && npm run test:unit:only",
     "test:redos": "node test/recheck.js > vuln.js",
     "test:redos": "node test/recheck.js > vuln.js",
+    "test:specs:only": "node --test --test-only --test-reporter=spec test/run-spec-tests.js",
+    "test:specs": "node --test --test-reporter=spec test/run-spec-tests.js",
     "test:types": "tsc --project tsconfig-type-test.json && attw -P --exclude-entrypoints ./bin/marked ./marked.min.js",
     "test:types": "tsc --project tsconfig-type-test.json && attw -P --exclude-entrypoints ./bin/marked ./marked.min.js",
     "test:umd": "node test/umd-test.js",
     "test:umd": "node test/umd-test.js",
-    "test:update": "node test/update-specs.js",
-    "rules": "node test/rules.js",
-    "bench": "npm run build && node test/bench.js",
-    "lint": "eslint --fix .",
-    "build:reset": "git checkout upstream/master lib/marked.cjs lib/marked.umd.js lib/marked.esm.js marked.min.js",
-    "build": "npm run rollup && npm run build:types && npm run build:man",
-    "build:docs": "npm run build && node docs/build.js",
-    "build:types": "tsc && dts-bundle-generator --project tsconfig.json -o lib/marked.d.ts src/marked.ts && dts-bundle-generator --project tsconfig.json -o lib/marked.d.cts src/marked.ts",
-    "build:man": "marked-man man/marked.1.md > man/marked.1",
-    "rollup": "rollup -c rollup.config.js"
+    "test:unit:only": "node --test --test-only --test-reporter=spec test/unit/*.test.js",
+    "test:unit": "node --test --test-reporter=spec test/unit/*.test.js",
+    "test:update": "node test/update-specs.js"
   },
   },
   "engines": {
   "engines": {
     "node": ">= 18"
     "node": ">= 18"

+ 1 - 1
src/helpers.ts

@@ -66,7 +66,7 @@ export function edit(regex: string | RegExp, opt?: string) {
 export function cleanUrl(href: string) {
 export function cleanUrl(href: string) {
   try {
   try {
     href = encodeURI(href).replace(/%25/g, '%');
     href = encodeURI(href).replace(/%25/g, '%');
-  } catch (e) {
+  } catch {
     return null;
     return null;
   }
   }
   return href;
   return href;

+ 1 - 1
test/specs/redos/cubic_def.cjs

@@ -1,4 +1,4 @@
 module.exports = {
 module.exports = {
   markdown: `[x]:${' '.repeat(1500)}x ${' '.repeat(1500)} x`,
   markdown: `[x]:${' '.repeat(1500)}x ${' '.repeat(1500)} x`,
-  html: `<p>[x]:${' '.repeat(1500)}x ${' '.repeat(1500)} x</p>`,
+  html: `<p>[x]:${' '.repeat(1500)}x ${' '.repeat(1500)} x</p>`
 };
 };

Some files were not shown because too many files changed in this diff