Merge pull request #1813 from yigaldviri/re2 · forwardemail/superagent@edf0986

2 files changed

lines changed

Original file line numberDiff line numberDiff line change

@@ -6,8 +6,7 @@

66

"browser": {

77

"./src/node/index.js": "./src/client.js",

88

"./lib/node/index.js": "./lib/client.js",

9-

"./test/support/server.js": "./test/support/blank.js",

10-

"re2": false

9+

"./test/support/server.js": "./test/support/blank.js"

1110

},

1211

"bugs": {

1312

"url": "https://github.com/ladjs/superagent/issues"

@@ -27,8 +26,7 @@

2726

"formidable": "^3.5.1",

2827

"methods": "^1.1.2",

2928

"mime": "2.6.0",

30-

"qs": "^6.11.0",

31-

"re2": "^1.21.3"

29+

"qs": "^6.11.0"

3230

},

3331

"devDependencies": {

3432

"@babel/cli": "^7.20.7",

Original file line numberDiff line numberDiff line change

@@ -1,14 +1,3 @@

1-

let RE2;

2-

let hasRE2 = true;

3-
4-

try {

5-

RE2 = require('re2');

6-

} catch {

7-

hasRE2 = false;

8-

}

9-
10-

const SafeRegExp = hasRE2 ? RE2 : RegExp;

11-
121
132

/**

143

* Return the mime type for the given `str`.

@@ -125,7 +114,7 @@ exports.mixin = (target, source) => {

125114

*/

126115
127116

exports.isGzipOrDeflateEncoding = (res) => {

128-

return new SafeRegExp(/^\s*(?:deflate|gzip)\s*$/).test(res.headers['content-encoding']);

117+

return new RegExp(/^\s*(?:deflate|gzip)\s*$/).test(res.headers['content-encoding']);

129118

};

130119
131120

/**

@@ -135,5 +124,5 @@ exports.isGzipOrDeflateEncoding = (res) => {

135124

*/

136125
137126

exports.isBrotliEncoding = (res) => {

138-

return new SafeRegExp(/^\s*(?:br)\s*$/).test(res.headers['content-encoding']);

127+

return new RegExp(/^\s*(?:br)\s*$/).test(res.headers['content-encoding']);

139128

};