Skip to content

Commit bce0314

Browse files
committed
fix: update regex optimize plugin
1 parent 9fb9023 commit bce0314

File tree

7 files changed

+51
-51
lines changed

7 files changed

+51
-51
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"eslint-plugin-json": "^4.0.0",
4242
"eslint-plugin-node": "^11.1.0",
4343
"eslint-plugin-only-warn": "npm:@aminya/eslint-plugin-only-warn@^1.2.2",
44-
"eslint-plugin-optimize-regex": "^1.2.1",
44+
"eslint-plugin-optimize-regex": "github:aminya/eslint-plugin-optimize-regex#16f9506ed2",
4545
"eslint-plugin-react": "^7.34.3",
4646
"eslint-plugin-solid": "^0.14.1",
4747
"eslint-plugin-yaml": "^1.0.2",
@@ -58,6 +58,7 @@
5858
"@types/coffeescript": "^2.5.7",
5959
"@types/eslint": "^8.56.10",
6060
"@types/eslint-config-prettier": "^6.11.3",
61+
"@types/eslint__js": "^8.42.3",
6162
"@types/execa": "^2.0.0",
6263
"@types/node": "^20.14.2",
6364
"@types/read-pkg-up": "^6.0.0",

pnpm-lock.yaml

Lines changed: 16 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/coffeescript.cts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ import * as eslintPluginCoffee from "eslint-plugin-coffee"
55
import * as onlyWarnPlugin from "eslint-plugin-only-warn"
66
import * as nodePlugin from "eslint-plugin-node"
77
import * as coffeeParser from "eslint-plugin-coffee/parser"
8-
import * as optimizeRegexPlugin from "eslint-plugin-optimize-regex"
98

109
export const coffeeConfig: Linter.FlatConfig<Linter.RulesRecord> = {
1110
// CoffeeScript files
1211
...eslintPluginCoffee.configs!.recommended,
13-
// ...optimizeRegexPlugin.configs!.all,
1412
...eslintPluginCoffee.configs!.prettier,
1513
files: ["**/*.coffee"],
1614
languageOptions: {

src/index.cts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { jsonConfig } from "./json.cjs"
44
import { yamlConfig } from "./yaml.cjs"
55
import { htmlConfig } from "./html.cjs"
66
// import { pluginImportSettings } from "./plugin-import-rules.cjs"
7+
import pluginOptmizeRegex from "eslint-plugin-optimize-regex"
78
import semverMajor from "semver/functions/major"
89
import { getEslintVersion } from "./eslint-version.cjs"
910
import { astroConfig } from "./astro.cjs"
@@ -28,7 +29,8 @@ function maybeAddCoffeeScript() {
2829
}
2930

3031
const config: Linter.FlatConfig[] = [
31-
jsConfig,
32+
...jsConfig,
33+
pluginOptmizeRegex.configs.all,
3234
...tsConfig,
3335
jsonConfig,
3436
yamlConfig,

src/javascript.cts

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,42 +6,40 @@ import * as eslintBabelParser from "@babel/eslint-parser"
66
import * as nodePlugin from "eslint-plugin-node"
77
import * as importPlugin from "eslint-plugin-import"
88
import * as onlyWarnPlugin from "eslint-plugin-only-warn"
9-
import * as optimizeRegexPlugin from "eslint-plugin-optimize-regex"
10-
// import * as prettierPlugin from "eslint-plugin-prettier"
119

1210
import js from "@eslint/js"
1311

14-
export const jsConfig: Linter.FlatConfig = {
15-
...js.configs.recommended,
16-
// ...optimizeRegexPlugin.configs!.all,
17-
// ...prettierPlugin.configs!.all,
18-
files: ["*.js", "*.mjs", "*.cjs", "*.jsx", "*.flow"],
19-
languageOptions: {
20-
parser: eslintBabelParser,
21-
parserOptions: {
22-
requireConfigFile: false,
23-
ecmaFeatures: {
24-
jsx: true,
12+
export const jsConfig: Linter.FlatConfig[] = [
13+
{
14+
...js.configs.recommended,
15+
files: ["*.js", "*.mjs", "*.cjs", "*.jsx", "*.flow"],
16+
languageOptions: {
17+
parser: eslintBabelParser,
18+
parserOptions: {
19+
requireConfigFile: false,
20+
ecmaFeatures: {
21+
jsx: true,
22+
},
23+
babelOptions: {
24+
plugins: ["@babel/plugin-syntax-flow", "@babel/plugin-syntax-jsx"],
25+
},
26+
ecmaVersion: "latest" as const,
27+
sourceType: "module" as const,
2528
},
26-
babelOptions: {
27-
plugins: ["@babel/plugin-syntax-flow", "@babel/plugin-syntax-jsx"],
29+
globals: {
30+
atom: "readonly",
2831
},
29-
ecmaVersion: "latest" as const,
30-
sourceType: "module" as const,
3132
},
32-
globals: {
33-
atom: "readonly",
33+
plugins: {
34+
node: nodePlugin,
35+
import: importPlugin,
36+
"only-warn": onlyWarnPlugin,
37+
},
38+
rules: {
39+
...eslintRulesExtra,
40+
...pluginNodeRules,
41+
...pluginImportRulesExtra,
42+
...importPlugin.configs.recommended.rules,
3443
},
3544
},
36-
plugins: {
37-
node: nodePlugin,
38-
import: importPlugin,
39-
"only-warn": onlyWarnPlugin,
40-
},
41-
rules: {
42-
...eslintRulesExtra,
43-
...pluginNodeRules,
44-
...pluginImportRulesExtra,
45-
...importPlugin.configs.recommended.rules,
46-
},
47-
}
45+
]

src/types.d.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@ declare module "eslint-plugin-coffee" {
3333
export = plugin
3434
}
3535

36-
declare module "eslint-plugin-optimize-regex" {
37-
import type { ESLint } from "eslint"
38-
const plugin: ESLint.Plugin
39-
export = plugin
40-
}
41-
4236
declare module "eslint-plugin-html" {
4337
import type { ESLint } from "eslint"
4438
const plugin: ESLint.Plugin

src/typescript.cts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ import type { Linter } from "eslint"
44
import * as importPlugin from "eslint-plugin-import"
55
import * as nodePlugin from "eslint-plugin-node"
66
import * as onlyWarnPlugin from "eslint-plugin-only-warn"
7-
import * as optimizeRegexPlugin from "eslint-plugin-optimize-regex"
8-
// import * as prettierPlugin from "eslint-plugin-prettier"
97
import type { GlobifiedEntry } from "globify-gitignore"
108
import makeSynchronous from "make-synchronous"
119
import { eslintRulesExtra } from "./official-eslint-rules.cjs"
@@ -130,9 +128,7 @@ const pluginTypeScriptProjectRules: Linter.RulesRecord = disableProjectBasedRule
130128
export const tsConfig: Linter.FlatConfig<Linter.RulesRecord>[] = [
131129
// TypeScript files
132130
js.configs.recommended,
133-
...typeScriptPlugin.configs.recommended,
134-
// optimizeRegexPlugin.configs!.all,
135-
131+
...typeScriptPlugin.configs.recommended as Linter.FlatConfig[],
136132
{
137133
files: tsFiles,
138134
languageOptions: {

0 commit comments

Comments
 (0)