yakuza0 2.20.9 → 2.20.12

package/nuxt/style.js

@@ -37,7 +37,7 @@ exports.default = function (config) {
 
   config.buildModules = ['@rdc/nuxtjs-style-resources'];
 
-  console.warn = function () {};
+  // console.warn = () => {};
   if (stylelint.enabled) {
     var sm = ['yakuza0/nuxt/buildModules/stylelint', stylelint.options];
     config.buildModules.push(sm);

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "yakuza0",
-  "version": "2.20.9",
+  "version": "2.20.12",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {
     "build": "babel --no-babelrc src -d . --presets=env --plugins=transform-runtime,transform-object-rest-spread,add-module-exports",
-    "pub:beta": "npm run build && npm version prerelease --preid=beta && npm publish --tag beta",
+    "pub:beta": "npm run build && npm version prerelease --preid=beta && pxnpm publish --tag beta",
     "pub": "npm run build && npm version patch && npm publish",
     "postinstall": "yk verify commit-init",
     "test": "jest"
@@ -48,6 +48,7 @@
     "compression": "^1.7.4",
     "consola": "^2.10.1",
     "core-js": "3.10.1",
+    "css-loader": "^5.2.7",
     "download": "^7.1.0",
     "eslint": "^7.2.0",
     "eslint-friendly-formatter": "^3.0.0",
@@ -75,6 +76,10 @@
     "node-ssh": "5",
     "path-match": "^1.2.4",
     "pm2": "^4.2.0",
+    "postcss": "^8.4.5",
+    "postcss-import": "^13.0.0",
+    "postcss-loader": "^4.3.0",
+    "postcss-url": "^10.1.3",
     "react-dev-utils": "^11.0.4",
     "require-from-string": "^2.0.2",
     "rimraf": "^2.6.3",

package/server/proxy/web.js

@@ -4,6 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
+var _keys = require('babel-runtime/core-js/object/keys');
+
+var _keys2 = _interopRequireDefault(_keys);
+
 var _regenerator = require('babel-runtime/regenerator');
 
 var _regenerator2 = _interopRequireDefault(_regenerator);
@@ -101,7 +105,7 @@ exports.default = function () {
         proxyConf = _ref.proxyConf,
         nuxt = _ref.nuxt,
         config = _ref.config;
-    var pKey, servers;
+    var pKey, servers, wsProxyKeys;
     return _regenerator2.default.wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
@@ -240,6 +244,10 @@ exports.default = function () {
                     }
                   });
 
+                  if (_config2.default.security.isStupid) {
+                    proxyReq.setHeader(_def.variable.adjoinIpHeader, (0, _server.getClientIP)(req, { stupid: true }));
+                  }
+
                   // const keys = Object.keys(yConf.proxyServer.proxy).join('|')
                   // if (req.crossParams.originUrl.match(new RegExp(`^\/(${keys})\/`))) {
                   //   _.forEach(yConf.proxyServer.proxyHeaders, dt => {
@@ -323,6 +331,8 @@ exports.default = function () {
               }, getCert()), app.callback()).listen(config.appConf.appPort));
             }
 
+            wsProxyKeys = (0, _keys2.default)(_config2.default.proxyServer.ws.proxy);
+
             servers.forEach(function (ser) {
               ser.on('upgrade', function (req, socket, head) {
                 if (_config2.default.server.om.enabled && _server.global.__cpm__ && (0, _om.isOmOpen)(req)) {
@@ -349,13 +359,26 @@ exports.default = function () {
                       headers: headers
                     }, defProxyOpt));
                   }
+
+                  var wsProxyKey = '';
+                  wsProxyKeys.forEach(function (key) {
+                    if (req.url.indexOf(key) !== -1) {
+                      wsProxyKey = key;
+                    }
+                  });
+                  if (wsProxyKey && wsProxyKey.startsWith(_config2.default.proxyServer.ws.prefix)) {
+                    req.url = req.url.replace('/' + wsProxyKey, '');
+                    _mid.proxy.ws(req, socket, head, (0, _extends3.default)({
+                      target: _config2.default.proxyServer.ws.proxy[wsProxyKey]
+                    }, defProxyOpt));
+                  }
                 }
 
                 socket.on('error', function (err) {});
               });
             });
 
-          case 7:
+          case 8:
           case 'end':
             return _context3.stop();
         }

package/utils/inclusive.js

@@ -466,7 +466,7 @@ var render = function () {
                     enabled: false,
                     eslint: {
                       enabled: true,
-                      test: ['vue', 'js'],
+                      test: ['vue'],
                       include: [],
                       exclude: [],
                       autoFixes: false,
@@ -495,7 +495,9 @@ var render = function () {
                 baseUrl: {},
                 lp: false,
                 ws: {
-                  key: 'api-ws'
+                  key: 'api-ws',
+                  prefix: 'proxy-ws-',
+                  proxy: {}
                 },
                 app: {},
                 // ...(mainConf && mainConf.proxyServer ? mainConf.proxyServer : {}),