1
0
mirror of https://github.com/S2-/minifyfromhtml.git synced 2025-08-02 20:00:05 +02:00

update modules

This commit is contained in:
s2
2020-07-20 16:16:07 +02:00
parent 783511ce12
commit 2b23424b86
785 changed files with 91905 additions and 56057 deletions

View File

@@ -29,9 +29,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
'use strict';
var net = require('net');
var urlParse = require('url').parse;
var util = require('util');
var ipRegex = require('ip-regex')({ exact: true });
var pubsuffix = require('./pubsuffix-psl');
var Store = require('./store').Store;
var MemoryCookieStore = require('./memstore').MemoryCookieStore;
@@ -320,7 +320,7 @@ function domainMatch(str, domStr, canonicalize) {
/* "All of the following [three] conditions hold:" (order adjusted from the RFC) */
/* "* The string is a host name (i.e., not an IP address)." */
if (net.isIP(str)) {
if (ipRegex.test(str)) {
return false;
}
@@ -1007,11 +1007,17 @@ CookieJar.prototype.setCookie = function(cookie, url, options, cb) {
}
// S5.3 step 1
if (!(cookie instanceof Cookie)) {
if (typeof(cookie) === 'string' || cookie instanceof String) {
cookie = Cookie.parse(cookie, { loose: loose });
if (!cookie) {
err = new Error("Cookie failed to parse");
return cb(options.ignoreError ? null : err);
}
}
if (!cookie) {
err = new Error("Cookie failed to parse");
else if (!(cookie instanceof Cookie)) {
// If you're seeing this error, and are passing in a Cookie object,
// it *might* be a Cookie object from another loaded version of tough-cookie.
err = new Error("First argument to setCookie must be a Cookie object or string");
return cb(options.ignoreError ? null : err);
}

View File

@@ -1,2 +1,2 @@
// generated by genversion
module.exports = '2.5.0'
module.exports = '3.0.1'

View File

@@ -1,29 +1,27 @@
{
"_from": "tough-cookie@^2.5.0",
"_id": "tough-cookie@2.5.0",
"_from": "tough-cookie@^3.0.1",
"_id": "tough-cookie@3.0.1",
"_inBundle": false,
"_integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
"_integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==",
"_location": "/tough-cookie",
"_phantomChildren": {},
"_requested": {
"type": "range",
"registry": true,
"raw": "tough-cookie@^2.5.0",
"raw": "tough-cookie@^3.0.1",
"name": "tough-cookie",
"escapedName": "tough-cookie",
"rawSpec": "^2.5.0",
"rawSpec": "^3.0.1",
"saveSpec": null,
"fetchSpec": "^2.5.0"
"fetchSpec": "^3.0.1"
},
"_requiredBy": [
"/jsdom",
"/request",
"/request-promise-native"
"/jsdom"
],
"_resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
"_shasum": "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2",
"_spec": "tough-cookie@^2.5.0",
"_where": "F:\\projects\\p\\minifyfromhtml\\node_modules\\jsdom",
"_resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
"_shasum": "9df4f57e739c26930a018184887f4adb7dca73b2",
"_spec": "tough-cookie@^3.0.1",
"_where": "D:\\Projects\\minifyfromhtml\\node_modules\\jsdom",
"author": {
"name": "Jeremy Stashewsky",
"email": "jstash@gmail.com"
@@ -53,6 +51,7 @@
}
],
"dependencies": {
"ip-regex": "^2.1.0",
"psl": "^1.1.28",
"punycode": "^2.1.1"
},
@@ -66,7 +65,7 @@
"vows": "^0.8.2"
},
"engines": {
"node": ">=0.8"
"node": ">=6"
},
"files": [
"lib"
@@ -94,5 +93,5 @@
"test": "vows test/*_test.js",
"version": "genversion lib/version.js && git add lib/version.js"
},
"version": "2.5.0"
"version": "3.0.1"
}