Skip to content

Commit 2e273e9

Browse files
authored
Update regexp-tree (#570)
1 parent 875c471 commit 2e273e9

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"lodash.snakecase": "^4.1.1",
4545
"lodash.upperfirst": "^4.3.1",
4646
"read-pkg-up": "^7.0.1",
47-
"regexp-tree": "^0.1.17",
47+
"regexp-tree": "^0.1.20",
4848
"reserved-words": "^0.1.2",
4949
"safe-regex": "^2.1.1",
5050
"semver": "^7.1.2"

rules/expiring-todo-comments.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ const packageDependencies = {
2727
};
2828

2929
const DEPENDENCY_INCLUSION_RE = /^[+-]\s*@?\S+\/?\S+/;
30-
const VERSION_COMPARISON_RE = /^(?<name>@?\S\/?\S+)@(?<condition>>|>=)(?<version>\d+(?:\.\d+){0,2}(?:-[\d\-a-z]+(?:\.[\d\-a-z]+)*)?(?:\+[\d\-a-z]+(?:\.[\d\-a-z]+)*)?)/i;
31-
const PKG_VERSION_RE = /^(?<condition>>|>=)(?<version>\d+(?:\.\d+){0,2}(?:-[\d-a-z]+(?:\.[\d-a-z]+)*)?(?:\+[\d-a-z]+(?:\.[\d-a-z]+)*)?)\s*$/;
30+
const VERSION_COMPARISON_RE = /^(?<name>@?\S\/?\S+)@(?<condition>>|>=)(?<version>\d+(?:\.\d+){0,2}(?:-[\da-z-]+(?:\.[\da-z-]+)*)?(?:\+[\da-z-]+(?:\.[\da-z-]+)*)?)/i;
31+
const PKG_VERSION_RE = /^(?<condition>>|>=)(?<version>\d+(?:\.\d+){0,2}(?:-[\da-z-]+(?:\.[\da-z-]+)*)?(?:\+[\da-z-]+(?:\.[\da-z-]+)*)?)\s*$/;
3232
const ISO8601_DATE = /\d{4}-\d{2}-\d{2}/;
3333

3434
function parseTodoWithArguments(string, {terms}) {

test/better-regex.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,10 @@ ruleTester.run('better-regex', rule, {
6464
// `patter` is not `string`
6565
'new RegExp(0)',
6666
// No arguments
67-
'new RegExp()'
67+
'new RegExp()',
68+
69+
// #472
70+
'/[ ;-]/g'
6871
],
6972
invalid: [
7073
// Literal regex
@@ -160,8 +163,8 @@ ruleTester.run('better-regex', rule, {
160163
},
161164
{
162165
code: 'const foo = /^by @([a-zA-Z0-9-]+)/',
163-
errors: createError('/^by @([a-zA-Z0-9-]+)/', '/^by @([\\d-A-Za-z]+)/'),
164-
output: 'const foo = /^by @([\\d-A-Za-z]+)/'
166+
errors: createError('/^by @([a-zA-Z0-9-]+)/', '/^by @([\\dA-Za-z-]+)/'),
167+
output: 'const foo = /^by @([\\dA-Za-z-]+)/'
165168
},
166169
{
167170
code: '/[GgHhIiå.Z:a-f"0-8%A*ä]/',
@@ -239,6 +242,12 @@ ruleTester.run('better-regex', rule, {
239242
code: 'const foo = new RegExp(/[0-9]/, 0)',
240243
errors: createError('/[0-9]/', '/\\d/'),
241244
output: 'const foo = new RegExp(/\\d/, 0)'
245+
},
246+
// #499
247+
{
248+
code: '/^[a-z][a-z0-9\\-]{5,29}$/',
249+
errors: createError('/^[a-z][a-z0-9\\-]{5,29}$/', '/^[a-z][\\da-z\\-]{5,29}$/'),
250+
output: '/^[a-z][\\da-z\\-]{5,29}$/'
242251
}
243252
]
244253
});

0 commit comments

Comments
 (0)