yakuza0 2.20.10 → 2.20.13
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/nuxt/render/csp.js +9 -1
- package/nuxt/style.js +1 -1
- package/package.json +6 -1
- package/server/proxy/web.js +4 -0
- package/utils/inclusive.js +2 -1
package/nuxt/render/csp.js
CHANGED
|
@@ -18,7 +18,15 @@ exports.default = function (config) {
|
|
|
18
18
|
|
|
19
19
|
var cspObj = {};
|
|
20
20
|
_yakuza._.forEach(csp, function (v, key) {
|
|
21
|
-
cspObj[_yakuza._.kebabCase(key)] = v
|
|
21
|
+
cspObj[_yakuza._.kebabCase(key)] = _yakuza._.compact(v.map(function (k) {
|
|
22
|
+
if (_config2.default.security.stupid && _config2.default.server.cspStrict) {
|
|
23
|
+
if (k === "*" || k === "data:" || k === "'unsafe-eval'" || k === "'unsafe-inline'") {
|
|
24
|
+
return '';
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
return k;
|
|
29
|
+
}));
|
|
22
30
|
});
|
|
23
31
|
|
|
24
32
|
if (!_config2.default.security.stupid) {
|
package/nuxt/style.js
CHANGED
|
@@ -37,7 +37,7 @@ exports.default = function (config) {
|
|
|
37
37
|
|
|
38
38
|
config.buildModules = ['@rdc/nuxtjs-style-resources'];
|
|
39
39
|
|
|
40
|
-
console.warn =
|
|
40
|
+
// console.warn = () => {};
|
|
41
41
|
if (stylelint.enabled) {
|
|
42
42
|
var sm = ['yakuza0/nuxt/buildModules/stylelint', stylelint.options];
|
|
43
43
|
config.buildModules.push(sm);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "yakuza0",
|
|
3
|
-
"version": "2.20.
|
|
3
|
+
"version": "2.20.13",
|
|
4
4
|
"description": "yakuza0 with nuxt",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -48,6 +48,7 @@
|
|
|
48
48
|
"compression": "^1.7.4",
|
|
49
49
|
"consola": "^2.10.1",
|
|
50
50
|
"core-js": "3.10.1",
|
|
51
|
+
"css-loader": "^5.2.7",
|
|
51
52
|
"download": "^7.1.0",
|
|
52
53
|
"eslint": "^7.2.0",
|
|
53
54
|
"eslint-friendly-formatter": "^3.0.0",
|
|
@@ -75,6 +76,10 @@
|
|
|
75
76
|
"node-ssh": "5",
|
|
76
77
|
"path-match": "^1.2.4",
|
|
77
78
|
"pm2": "^4.2.0",
|
|
79
|
+
"postcss": "^8.4.5",
|
|
80
|
+
"postcss-import": "^13.0.0",
|
|
81
|
+
"postcss-loader": "^4.3.0",
|
|
82
|
+
"postcss-url": "^10.1.3",
|
|
78
83
|
"react-dev-utils": "^11.0.4",
|
|
79
84
|
"require-from-string": "^2.0.2",
|
|
80
85
|
"rimraf": "^2.6.3",
|
package/server/proxy/web.js
CHANGED
|
@@ -244,6 +244,10 @@ exports.default = function () {
|
|
|
244
244
|
}
|
|
245
245
|
});
|
|
246
246
|
|
|
247
|
+
if (_config2.default.security.isStupid) {
|
|
248
|
+
proxyReq.setHeader(_def.variable.adjoinIpHeader, (0, _server.getClientIP)(req, { stupid: true }));
|
|
249
|
+
}
|
|
250
|
+
|
|
247
251
|
// const keys = Object.keys(yConf.proxyServer.proxy).join('|')
|
|
248
252
|
// if (req.crossParams.originUrl.match(new RegExp(`^\/(${keys})\/`))) {
|
|
249
253
|
// _.forEach(yConf.proxyServer.proxyHeaders, dt => {
|
package/utils/inclusive.js
CHANGED
|
@@ -288,6 +288,7 @@ var render = function () {
|
|
|
288
288
|
autoOpenBrowser: true,
|
|
289
289
|
cookieSameSite: 'Lax',
|
|
290
290
|
cspSwitch: true,
|
|
291
|
+
cspStrict: false,
|
|
291
292
|
// ...mainConf.server,
|
|
292
293
|
// ...ykConf.server,
|
|
293
294
|
// csp,
|
|
@@ -466,7 +467,7 @@ var render = function () {
|
|
|
466
467
|
enabled: false,
|
|
467
468
|
eslint: {
|
|
468
469
|
enabled: true,
|
|
469
|
-
test: ['vue'
|
|
470
|
+
test: ['vue'],
|
|
470
471
|
include: [],
|
|
471
472
|
exclude: [],
|
|
472
473
|
autoFixes: false,
|