From 0483f5c5deaf18c968a128657923103e49f4e67a Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Thu, 24 May 2018 13:31:26 -0700 Subject: Flatten dependencies and add dev deps to git --- .../is-cidr/node_modules/cidr-regex/LICENSE | 22 ------ .../is-cidr/node_modules/cidr-regex/README.md | 64 ------------------ .../is-cidr/node_modules/cidr-regex/index.js | 13 ---- .../cidr-regex/node_modules/ip-regex/index.js | 24 ------- .../cidr-regex/node_modules/ip-regex/license | 21 ------ .../cidr-regex/node_modules/ip-regex/package.json | 77 --------------------- .../cidr-regex/node_modules/ip-regex/readme.md | 63 ----------------- .../is-cidr/node_modules/cidr-regex/package.json | 78 ---------------------- node_modules/is-cidr/package.json | 12 ++-- 9 files changed, 7 insertions(+), 367 deletions(-) delete mode 100644 node_modules/is-cidr/node_modules/cidr-regex/LICENSE delete mode 100644 node_modules/is-cidr/node_modules/cidr-regex/README.md delete mode 100644 node_modules/is-cidr/node_modules/cidr-regex/index.js delete mode 100644 node_modules/is-cidr/node_modules/cidr-regex/node_modules/ip-regex/index.js delete mode 100644 node_modules/is-cidr/node_modules/cidr-regex/node_modules/ip-regex/license delete mode 100644 node_modules/is-cidr/node_modules/cidr-regex/node_modules/ip-regex/package.json delete mode 100644 node_modules/is-cidr/node_modules/cidr-regex/node_modules/ip-regex/readme.md delete mode 100644 node_modules/is-cidr/node_modules/cidr-regex/package.json (limited to 'node_modules/is-cidr') diff --git a/node_modules/is-cidr/node_modules/cidr-regex/LICENSE b/node_modules/is-cidr/node_modules/cidr-regex/LICENSE deleted file mode 100644 index 9669c20f8..000000000 --- a/node_modules/is-cidr/node_modules/cidr-regex/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -Copyright (c) silverwind -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/node_modules/is-cidr/node_modules/cidr-regex/README.md b/node_modules/is-cidr/node_modules/cidr-regex/README.md deleted file mode 100644 index d24d7071a..000000000 --- a/node_modules/is-cidr/node_modules/cidr-regex/README.md +++ /dev/null @@ -1,64 +0,0 @@ -# cidr-regex -[![](https://img.shields.io/npm/v/cidr-regex.svg?style=flat)](https://www.npmjs.org/package/cidr-regex) [![](https://img.shields.io/npm/dm/cidr-regex.svg)](https://www.npmjs.org/package/cidr-regex) [![](https://api.travis-ci.org/silverwind/cidr-regex.svg?style=flat)](https://travis-ci.org/silverwind/cidr-regex) - -> Regular expression for matching IP addresses in CIDR notation - -## Install - -```sh -$ npm install --save cidr-regex -``` - -## Usage - -```js -const cidrRegex = require('cidr-regex'); - -// Contains a CIDR IP address? -cidrRegex().test('foo 192.168.0.1/24'); -//=> true - -// Is a CIDR IP address? -cidrRegex({exact: true}).test('foo 192.168.0.1/24'); -//=> false - -cidrRegex.v6({exact: true}).test('1:2:3:4:5:6:7:8/64'); -//=> true - -'foo 192.168.0.1/24 bar 1:2:3:4:5:6:7:8/64 baz'.match(cidrRegex()); -//=> ['192.168.0.1/24', '1:2:3:4:5:6:7:8/64'] -``` - -## API - -### cidrRegex([options]) - -Returns a regex for matching both IPv4 and IPv6 CIDR IP addresses. - -### cidrRegex.v4([options]) - -Returns a regex for matching IPv4 CIDR IP addresses. - -### cidrRegex.v6([options]) - -Returns a regex for matching IPv6 CIDR IP addresses. - -#### options.exact - -Type: `boolean`
-Default: `false` *(Matches any CIDR IP address in a string)* - -Only match an exact string. Useful with `RegExp#test()` to check if a string is a CIDR IP address. - - -## Related - -- [is-cidr](https://github.com/silverwind/is-cidr) - Check if a string is an IP address in CIDR notation -- [is-ip](https://github.com/sindresorhus/is-ip) - Check if a string is an IP address -- [ip-regex](https://github.com/sindresorhus/ip-regex) - Regular expression for matching IP addresses - -## License - -© [silverwind](https://github.com/silverwind), distributed under BSD licence - -Based on previous work by [Felipe Apostol](https://github.com/flipjs) diff --git a/node_modules/is-cidr/node_modules/cidr-regex/index.js b/node_modules/is-cidr/node_modules/cidr-regex/index.js deleted file mode 100644 index 190cefa7b..000000000 --- a/node_modules/is-cidr/node_modules/cidr-regex/index.js +++ /dev/null @@ -1,13 +0,0 @@ -"use strict"; - -const ipRegex = require("ip-regex"); - -const v4 = ipRegex.v4().source + "\\/(3[0-2]|[12]?[0-9])"; -const v6 = ipRegex.v6().source + "\\/(12[0-8]|1[01][0-9]|[1-9]?[0-9])"; - -const ip = module.exports = opts => opts && opts.exact ? - new RegExp(`(?:^${v4}$)|(?:^${v6}$)`) : - new RegExp(`(?:${v4})|(?:${v6})`, "g"); - -ip.v4 = opts => opts && opts.exact ? new RegExp(`^${v4}$`) : new RegExp(v4, "g"); -ip.v6 = opts => opts && opts.exact ? new RegExp(`^${v6}$`) : new RegExp(v6, "g"); diff --git a/node_modules/is-cidr/node_modules/cidr-regex/node_modules/ip-regex/index.js b/node_modules/is-cidr/node_modules/cidr-regex/node_modules/ip-regex/index.js deleted file mode 100644 index 973e5f41c..000000000 --- a/node_modules/is-cidr/node_modules/cidr-regex/node_modules/ip-regex/index.js +++ /dev/null @@ -1,24 +0,0 @@ -'use strict'; - -const v4 = '(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])(?:\\.(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])){3}'; - -const v6seg = '[0-9a-fA-F]{1,4}'; -const v6 = ` -( -(?:${v6seg}:){7}(?:${v6seg}|:)| // 1:2:3:4:5:6:7:: 1:2:3:4:5:6:7:8 -(?:${v6seg}:){6}(?:${v4}|:${v6seg}|:)| // 1:2:3:4:5:6:: 1:2:3:4:5:6::8 1:2:3:4:5:6::8 1:2:3:4:5:6::1.2.3.4 -(?:${v6seg}:){5}(?::${v4}|(:${v6seg}){1,2}|:)| // 1:2:3:4:5:: 1:2:3:4:5::7:8 1:2:3:4:5::8 1:2:3:4:5::7:1.2.3.4 -(?:${v6seg}:){4}(?:(:${v6seg}){0,1}:${v4}|(:${v6seg}){1,3}|:)| // 1:2:3:4:: 1:2:3:4::6:7:8 1:2:3:4::8 1:2:3:4::6:7:1.2.3.4 -(?:${v6seg}:){3}(?:(:${v6seg}){0,2}:${v4}|(:${v6seg}){1,4}|:)| // 1:2:3:: 1:2:3::5:6:7:8 1:2:3::8 1:2:3::5:6:7:1.2.3.4 -(?:${v6seg}:){2}(?:(:${v6seg}){0,3}:${v4}|(:${v6seg}){1,5}|:)| // 1:2:: 1:2::4:5:6:7:8 1:2::8 1:2::4:5:6:7:1.2.3.4 -(?:${v6seg}:){1}(?:(:${v6seg}){0,4}:${v4}|(:${v6seg}){1,6}|:)| // 1:: 1::3:4:5:6:7:8 1::8 1::3:4:5:6:7:1.2.3.4 -(?::((?::${v6seg}){0,5}:${v4}|(?::${v6seg}){1,7}|:)) // ::2:3:4:5:6:7:8 ::2:3:4:5:6:7:8 ::8 ::1.2.3.4 -)(%[0-9a-zA-Z]{1,})? // %eth0 %1 -`.replace(/\s*\/\/.*$/gm, '').replace(/\n/g, '').trim(); - -const ip = module.exports = opts => opts && opts.exact ? - new RegExp(`(?:^${v4}$)|(?:^${v6}$)`) : - new RegExp(`(?:${v4})|(?:${v6})`, 'g'); - -ip.v4 = opts => opts && opts.exact ? new RegExp(`^${v4}$`) : new RegExp(v4, 'g'); -ip.v6 = opts => opts && opts.exact ? new RegExp(`^${v6}$`) : new RegExp(v6, 'g'); diff --git a/node_modules/is-cidr/node_modules/cidr-regex/node_modules/ip-regex/license b/node_modules/is-cidr/node_modules/cidr-regex/node_modules/ip-regex/license deleted file mode 100644 index 654d0bfe9..000000000 --- a/node_modules/is-cidr/node_modules/cidr-regex/node_modules/ip-regex/license +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) Sindre Sorhus (sindresorhus.com) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/node_modules/is-cidr/node_modules/cidr-regex/node_modules/ip-regex/package.json b/node_modules/is-cidr/node_modules/cidr-regex/node_modules/ip-regex/package.json deleted file mode 100644 index 427bc9917..000000000 --- a/node_modules/is-cidr/node_modules/cidr-regex/node_modules/ip-regex/package.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "_from": "ip-regex@^2.1.0", - "_id": "ip-regex@2.1.0", - "_inBundle": false, - "_integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", - "_location": "/is-cidr/cidr-regex/ip-regex", - "_phantomChildren": {}, - "_requested": { - "type": "range", - "registry": true, - "raw": "ip-regex@^2.1.0", - "name": "ip-regex", - "escapedName": "ip-regex", - "rawSpec": "^2.1.0", - "saveSpec": null, - "fetchSpec": "^2.1.0" - }, - "_requiredBy": [ - "/is-cidr/cidr-regex" - ], - "_resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", - "_shasum": "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9", - "_spec": "ip-regex@^2.1.0", - "_where": "/Users/rebecca/code/npm/node_modules/is-cidr/node_modules/cidr-regex", - "author": { - "name": "Sindre Sorhus", - "email": "sindresorhus@gmail.com", - "url": "sindresorhus.com" - }, - "bugs": { - "url": "https://github.com/sindresorhus/ip-regex/issues" - }, - "bundleDependencies": false, - "deprecated": false, - "description": "Regular expression for matching IP addresses (IPv4 & IPv6)", - "devDependencies": { - "ava": "*", - "xo": "*" - }, - "engines": { - "node": ">=4" - }, - "files": [ - "index.js" - ], - "homepage": "https://github.com/sindresorhus/ip-regex#readme", - "keywords": [ - "ip", - "ipv6", - "ipv4", - "regex", - "regexp", - "re", - "match", - "test", - "find", - "text", - "pattern", - "internet", - "protocol", - "address", - "validate" - ], - "license": "MIT", - "name": "ip-regex", - "repository": { - "type": "git", - "url": "git+https://github.com/sindresorhus/ip-regex.git" - }, - "scripts": { - "test": "xo && ava" - }, - "version": "2.1.0", - "xo": { - "esnext": true - } -} diff --git a/node_modules/is-cidr/node_modules/cidr-regex/node_modules/ip-regex/readme.md b/node_modules/is-cidr/node_modules/cidr-regex/node_modules/ip-regex/readme.md deleted file mode 100644 index 66bc7f273..000000000 --- a/node_modules/is-cidr/node_modules/cidr-regex/node_modules/ip-regex/readme.md +++ /dev/null @@ -1,63 +0,0 @@ -# ip-regex [![Build Status](https://travis-ci.org/sindresorhus/ip-regex.svg?branch=master)](https://travis-ci.org/sindresorhus/ip-regex) - -> Regular expression for matching IP addresses - - -## Install - -``` -$ npm install --save ip-regex -``` - - -## Usage - -```js -const ipRegex = require('ip-regex'); - -// Contains an IP address? -ipRegex().test('unicorn 192.168.0.1'); -//=> true - -// Is an IP address? -ipRegex({exact: true}).test('unicorn 192.168.0.1'); -//=> false - -ipRegex.v6({exact: true}).test('1:2:3:4:5:6:7:8'); -//=> true - -'unicorn 192.168.0.1 cake 1:2:3:4:5:6:7:8 rainbow'.match(ipRegex()); -//=> ['192.168.0.1', '1:2:3:4:5:6:7:8'] -``` - - -## API - -### ipRegex([options]) - -Returns a regex for matching both IPv4 and IPv6. - -### ipRegex.v4([options]) - -Returns a regex for matching IPv4. - -### ipRegex.v6([options]) - -Returns a regex for matching IPv6. - -#### options.exact - -Type: `boolean`
-Default: `false` *(Matches any IP address in a string)* - -Only match an exact string. Useful with `RegExp#test()` to check if a string is an IP address. - - -## Related - -- [is-ip](https://github.com/sindresorhus/is-ip) - Check if a string is an IP address - - -## License - -MIT © [Sindre Sorhus](https://sindresorhus.com) diff --git a/node_modules/is-cidr/node_modules/cidr-regex/package.json b/node_modules/is-cidr/node_modules/cidr-regex/package.json deleted file mode 100644 index 869d90aad..000000000 --- a/node_modules/is-cidr/node_modules/cidr-regex/package.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "_from": "cidr-regex@^2.0.8", - "_id": "cidr-regex@2.0.8", - "_inBundle": false, - "_integrity": "sha512-3r0E5P6Oeg4SCvEERX7W5fPkPz8nKWwGzU6RJ/VvROOsqiq5g6sf43c/g+sUpA29Htc7R0SG15P/Scr5lfap4g==", - "_location": "/is-cidr/cidr-regex", - "_phantomChildren": {}, - "_requested": { - "type": "range", - "registry": true, - "raw": "cidr-regex@^2.0.8", - "name": "cidr-regex", - "escapedName": "cidr-regex", - "rawSpec": "^2.0.8", - "saveSpec": null, - "fetchSpec": "^2.0.8" - }, - "_requiredBy": [ - "/is-cidr" - ], - "_resolved": "https://registry.npmjs.org/cidr-regex/-/cidr-regex-2.0.8.tgz", - "_shasum": "c79bae6223d241c0860d93bfde1fb1c1c4fdcab6", - "_spec": "cidr-regex@^2.0.8", - "_where": "/Users/rebecca/code/npm/node_modules/is-cidr", - "author": { - "name": "silverwind", - "email": "me@silverwind.io" - }, - "bugs": { - "url": "https://github.com/silverwind/cidr-regex/issues" - }, - "bundleDependencies": false, - "contributors": [ - { - "name": "Felipe Apostol", - "email": "flipjs.io@gmail.com", - "url": "http://flipjs.io/" - } - ], - "dependencies": { - "ip-regex": "^2.1.0" - }, - "deprecated": false, - "description": "Regular expression for matching IP addresses in CIDR notation", - "devDependencies": { - "ava": "^0.25.0", - "eslint": "^4.18.2", - "eslint-config-silverwind": "^1.0.37", - "updates": "^2.3.1" - }, - "engines": { - "node": ">=4" - }, - "files": [ - "index.js" - ], - "homepage": "https://github.com/silverwind/cidr-regex#readme", - "keywords": [ - "cidr", - "regex", - "notation", - "cidr notation", - "prefix", - "prefixes", - "ip", - "ip address" - ], - "license": "BSD-2-Clause", - "name": "cidr-regex", - "repository": { - "type": "git", - "url": "git+https://github.com/silverwind/cidr-regex.git" - }, - "scripts": { - "test": "make test" - }, - "version": "2.0.8" -} diff --git a/node_modules/is-cidr/package.json b/node_modules/is-cidr/package.json index 5e81ad10b..5499a0dca 100644 --- a/node_modules/is-cidr/package.json +++ b/node_modules/is-cidr/package.json @@ -1,4 +1,10 @@ { + "_args": [ + [ + "is-cidr@2.0.5", + "/Users/rebecca/code/npm" + ] + ], "_from": "is-cidr@2.0.5", "_id": "is-cidr@2.0.5", "_inBundle": false, @@ -16,12 +22,10 @@ "fetchSpec": "2.0.5" }, "_requiredBy": [ - "#USER", "/" ], "_resolved": "https://registry.npmjs.org/is-cidr/-/is-cidr-2.0.5.tgz", - "_shasum": "13227927d71865d1177fe0e5b60e6ddd3dee0034", - "_spec": "is-cidr@2.0.5", + "_spec": "2.0.5", "_where": "/Users/rebecca/code/npm", "author": { "name": "silverwind", @@ -30,7 +34,6 @@ "bugs": { "url": "https://github.com/silverwind/is-cidr/issues" }, - "bundleDependencies": false, "contributors": [ { "name": "Felipe Apostol", @@ -41,7 +44,6 @@ "dependencies": { "cidr-regex": "^2.0.8" }, - "deprecated": false, "description": "Check if a string is an IP address in CIDR notation", "devDependencies": { "ava": "^0.25.0", -- cgit v1.2.3