Skip to content

Commit 1b3dc9a

Browse files
wraithgarwraithgar
committed
deps: cidr-regex@5.0.3
1 parent 4307af6 commit 1b3dc9a

8 files changed

Lines changed: 22 additions & 126 deletions

File tree

‎DEPENDENCIES.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ graph LR;
270270
cacache-->p-map;
271271
cacache-->ssri;
272272
cacache-->unique-filename;
273-
cidr-regex-->ip-regex;
274273
cli-columns-->string-width;
275274
cli-columns-->strip-ansi;
276275
debug-->ms;

‎node_modules/.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
!/ini
7676
!/init-package-json
7777
!/ip-address
78-
!/ip-regex
7978
!/is-cidr
8079
!/is-fullwidth-code-point
8180
!/isexe

‎node_modules/cidr-regex/dist/index.js‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
1-
import ipRegex from "ip-regex";
21
const defaultOpts = { exact: false };
3-
const v4str = `${ipRegex.v4().source}\\/(3[0-2]|[12]?[0-9])`;
4-
const v6str = `${ipRegex.v6().source}\\/(12[0-8]|1[01][0-9]|[1-9]?[0-9])`;
5-
const v4exact = new RegExp(`^${v4str}$`);
6-
const v6exact = new RegExp(`^${v6str}$`);
7-
const v46exact = new RegExp(`(?:^${v4str}$)|(?:^${v6str}$)`);
8-
const cidrRegex = ({ exact } = defaultOpts) => exact ? v46exact : new RegExp(`(?:${v4str})|(?:${v6str})`, "g");
9-
const v4 = cidrRegex.v4 = ({ exact } = defaultOpts) => exact ? v4exact : new RegExp(v4str, "g");
10-
const v6 = cidrRegex.v6 = ({ exact } = defaultOpts) => exact ? v6exact : new RegExp(v6str, "g");
2+
const v4src = "(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}\\/(3[0-2]|[12]?[0-9])";
3+
const v6src = "(?:(?:[a-fA-F\\d]{1,4}:){7}(?:[a-fA-F\\d]{1,4}|:)|(?:[a-fA-F\\d]{1,4}:){6}(?:(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}|:[a-fA-F\\d]{1,4}|:)|(?:[a-fA-F\\d]{1,4}:){5}(?::(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}|(?::[a-fA-F\\d]{1,4}){1,2}|:)|(?:[a-fA-F\\d]{1,4}:){4}(?:(?::[a-fA-F\\d]{1,4})?:(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}|(?::[a-fA-F\\d]{1,4}){1,3}|:)|(?:[a-fA-F\\d]{1,4}:){3}(?:(?::[a-fA-F\\d]{1,4}){0,2}:(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}|(?::[a-fA-F\\d]{1,4}){1,4}|:)|(?:[a-fA-F\\d]{1,4}:){2}(?:(?::[a-fA-F\\d]{1,4}){0,3}:(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}|(?::[a-fA-F\\d]{1,4}){1,5}|:)|[a-fA-F\\d]{1,4}:(?:(?::[a-fA-F\\d]{1,4}){0,4}:(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}|(?::[a-fA-F\\d]{1,4}){1,6}|:)|:(?:(?::[a-fA-F\\d]{1,4}){0,5}:(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}|(?::[a-fA-F\\d]{1,4}){1,7}|:))(?:%[0-9a-zA-Z]+)?\\/(12[0-8]|1[01][0-9]|[1-9]?[0-9])";
4+
const v46src = `${v4src}|${v6src}`;
5+
const v4exact = new RegExp(`^${v4src}$`);
6+
const v6exact = new RegExp(`^${v6src}$`);
7+
const v46exact = new RegExp(`^${v4src}$|^${v6src}$`);
8+
const v4global = new RegExp(v4src, "g");
9+
const v6global = new RegExp(v6src, "g");
10+
const v46global = new RegExp(v46src, "g");
11+
function resetRegex(re) {
12+
re.lastIndex = 0;
13+
return re;
14+
}
15+
const cidrRegex = ({ exact } = defaultOpts) => exact ? v46exact : resetRegex(v46global);
16+
const v4 = cidrRegex.v4 = ({ exact } = defaultOpts) => exact ? v4exact : resetRegex(v4global);
17+
const v6 = cidrRegex.v6 = ({ exact } = defaultOpts) => exact ? v6exact : resetRegex(v6global);
1118
export {
1219
cidrRegex as default,
1320
v4,

‎node_modules/cidr-regex/package.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cidr-regex",
3-
"version": "5.0.2",
3+
"version": "5.0.3",
44
"description": "Regular expression for matching IP addresses in CIDR notation",
55
"author": "silverwind <me@silverwind.io>",
66
"contributors": [
@@ -19,17 +19,16 @@
1919
"engines": {
2020
"node": ">=20"
2121
},
22-
"dependencies": {
23-
"ip-regex": "5.0.0"
24-
},
2522
"devDependencies": {
2623
"@types/node": "25.0.10",
24+
"@typescript/native-preview": "7.0.0-dev.20260212.1",
2725
"eslint": "9.39.2",
2826
"eslint-config-silverwind": "120.1.2",
2927
"jest-extended": "7.0.0",
3028
"typescript": "5.9.3",
3129
"typescript-config-silverwind": "14.0.0",
3230
"updates": "17.0.8",
31+
"updates-config-silverwind": "1.0.3",
3332
"versions": "14.0.3",
3433
"vite": "7.3.1",
3534
"vite-config-silverwind": "6.0.9",

‎node_modules/ip-regex/index.js‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎node_modules/ip-regex/license‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎node_modules/ip-regex/package.json‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎package-lock.json‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3250,14 +3250,11 @@
32503250
}
32513251
},
32523252
"node_modules/cidr-regex": {
3253-
"version": "5.0.2",
3254-
"resolved": "https://registry.npmjs.org/cidr-regex/-/cidr-regex-5.0.2.tgz",
3255-
"integrity": "sha512-wTkbbfAFb6i7JN6gpmcTj5XiwtUxWc/kE2PpxDr2pFndF1tgS3gUPqKnhl5HqdgRPhy+6Ad841jXjg91/JnJWA==",
3253+
"version": "5.0.3",
3254+
"resolved": "https://registry.npmjs.org/cidr-regex/-/cidr-regex-5.0.3.tgz",
3255+
"integrity": "sha512-zfPT2uurEroxXqefaL2L7/fT5ED2XTutC6UwFbSZfqSOk1vk5VFY6xa6/R6pBxB4Uc8MNPbRW5ykqutFG5P5ww==",
32563256
"inBundle": true,
32573257
"license": "BSD-2-Clause",
3258-
"dependencies": {
3259-
"ip-regex": "5.0.0"
3260-
},
32613258
"engines": {
32623259
"node": ">=20"
32633260
}
@@ -6164,19 +6161,6 @@
61646161
"node": ">= 12"
61656162
}
61666163
},
6167-
"node_modules/ip-regex": {
6168-
"version": "5.0.0",
6169-
"resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-5.0.0.tgz",
6170-
"integrity": "sha512-fOCG6lhoKKakwv+C6KdsOnGvgXnmgfmp0myi3bcNwj3qfwPAxRKWEuFhvEFF7ceYIz6+1jRZ+yguLFAmUNPEfw==",
6171-
"inBundle": true,
6172-
"license": "MIT",
6173-
"engines": {
6174-
"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
6175-
},
6176-
"funding": {
6177-
"url": "https://github.com/sponsors/sindresorhus"
6178-
}
6179-
},
61806164
"node_modules/is-array-buffer": {
61816165
"version": "3.0.5",
61826166
"dev": true,

0 commit comments

Comments
 (0)