Merge branch 'niftylettuce:master' into master

Author: pjotrsavitski

README.md

@@ -98,6 +98,12 @@ This is the solution for you if you're just using `<script>` tags everywhere!
 
 Assuming you are using [browserify][], [webpack][], [rollup][], or another bundler, you can simply follow [Node](#node) usage above.
 
+#### TypeScript
+
+To use this package with [TypeScript](https://www.typescriptlang.org/), you can install the [`@types/url-regex-safe`](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/url-regex-safe) package for type definitions.
+
+```sh
+npm install --save-dev @types/url-regex-safe
 
 ## Options
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "url-regex-safe",
   "description": "Regular expression matching for URL's. Maintained, safe, and browser-friendly version of url-regex. Resolves CVE-2020-7661. Works in Node v10.12.0+ and browsers.",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "author": "Nick Baugh <niftylettuce@gmail.com> (http://niftylettuce.com/)",
   "browser": {
     "re2": false
@@ -17,7 +17,7 @@
   ],
   "dependencies": {
     "ip-regex": "^4.3.0",
-    "re2": "^1.15.9",
+    "re2": "^1.16.0",
     "tlds": "^1.217.0"
   },
   "devDependencies": {

src/index.js

@@ -1,9 +1,15 @@
-const RE2 = require('re2');
 const ipRegex = require('ip-regex');
 const tlds = require('tlds');
 
 /* istanbul ignore next */
-const SafeRegExp = typeof RE2 === 'function' ? RE2 : RegExp;
+const SafeRegExp = (() => {
+  try {
+    const RE2 = require('re2');
+    return typeof RE2 === 'function' ? RE2 : RegExp;
+  } catch {
+    return RegExp;
+  }
+})();
 const ipv4 = ipRegex.v4().source;
 const ipv6 = ipRegex.v6().source;