yakuza0 2.20.5 → 2.20.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/server/proxy/tire.js +19 -7
- package/utils/inclusive.js +3 -1
package/package.json
CHANGED
package/server/proxy/tire.js
CHANGED
|
@@ -4,6 +4,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
|
|
7
|
+
var _keys = require("babel-runtime/core-js/object/keys");
|
|
8
|
+
|
|
9
|
+
var _keys2 = _interopRequireDefault(_keys);
|
|
10
|
+
|
|
7
11
|
var _extends2 = require("babel-runtime/helpers/extends");
|
|
8
12
|
|
|
9
13
|
var _extends3 = _interopRequireDefault(_extends2);
|
|
@@ -398,23 +402,31 @@ exports.default = function () {
|
|
|
398
402
|
server.generate.exclude = server.generate.exclude.split(',');
|
|
399
403
|
}
|
|
400
404
|
|
|
401
|
-
if (server.generate.
|
|
402
|
-
|
|
403
|
-
server.generate.include.forEach(function (path) {
|
|
405
|
+
if (server.generate.exclude.length !== 0) {
|
|
406
|
+
server.generate.exclude.forEach(function (path) {
|
|
404
407
|
if ((0, _server.minimatch)(req.url, path)) {
|
|
405
|
-
isCache =
|
|
408
|
+
isCache = false;
|
|
406
409
|
}
|
|
407
410
|
});
|
|
408
411
|
}
|
|
409
412
|
|
|
410
|
-
if (
|
|
411
|
-
|
|
412
|
-
if ((0, _server.minimatch)(req.url, path)) {
|
|
413
|
+
if ((0, _keys2.default)(appConf.proxyServer.proxy || []).length > 0) {
|
|
414
|
+
_server._.forEach(appConf.proxyServer.proxy, function (v, path) {
|
|
415
|
+
if ((0, _server.minimatch)(req.url, "/" + path + "*") || (0, _server.minimatch)(req.url, "/" + path + "/**")) {
|
|
413
416
|
isCache = false;
|
|
414
417
|
}
|
|
415
418
|
});
|
|
416
419
|
}
|
|
417
420
|
|
|
421
|
+
if (server.generate.include.length !== 0) {
|
|
422
|
+
isCache = false;
|
|
423
|
+
server.generate.include.forEach(function (path) {
|
|
424
|
+
if ((0, _server.minimatch)(req.url, path)) {
|
|
425
|
+
isCache = true;
|
|
426
|
+
}
|
|
427
|
+
});
|
|
428
|
+
}
|
|
429
|
+
|
|
418
430
|
var libContentType = ['application/javascript; charset=utf-8', 'text/css; charset=utf-8', 'font/woff', 'image/png', 'image/jpeg', 'image/x-icon'];
|
|
419
431
|
|
|
420
432
|
var isTireSave = _config2.default.security.isTire && isCache && ['text/html; charset=utf-8'].concat(libContentType).includes((proxyRes.headers['content-type'] || '').toLowerCase());
|
package/utils/inclusive.js
CHANGED
|
@@ -809,7 +809,9 @@ var render = function () {
|
|
|
809
809
|
domain: [].concat((0, _toConsumableArray3.default)(conf.server.tfs.fastdfs.domain), (0, _toConsumableArray3.default)(v.server && v.server.tfs && v.server.tfs.fastdfs && v.server.tfs.fastdfs.domain || []))
|
|
810
810
|
}
|
|
811
811
|
},
|
|
812
|
-
generate: (0, _extends3.default)({}, conf.server.generate, v.server && v.server.generate
|
|
812
|
+
generate: (0, _extends3.default)({}, conf.server.generate, v.server && v.server.generate, {
|
|
813
|
+
exclude: [].concat((0, _toConsumableArray3.default)(conf.server.generate.exclude), (0, _toConsumableArray3.default)(v.server && v.server.generate && v.server.generate.exclude || []))
|
|
814
|
+
}),
|
|
813
815
|
sslify: (0, _extends3.default)({}, conf.server.sslify, v.server && v.server.sslify),
|
|
814
816
|
gray: (0, _extends3.default)({}, conf.server.gray, v.server && v.server.gray)
|
|
815
817
|
});
|