yakuza0 2.22.1-beta.0 → 2.22.1-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yakuza0",
-  "version": "2.22.1-beta.0",
+  "version": "2.22.1-beta.1",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {

package/utils/inclusive.js

@@ -698,13 +698,11 @@ var render = function () {
               });
             }
 
-            conf.router.config = _yakuza._.forEach(conf.router.config, function (v, k) {
+            conf.router.config = _yakuza._.mapValues(conf.router.config, function (v) {
               if (conf.inImage && conf.cmd === 'server container') {
                 v.enabled = false;
               }
-              // return v
-              delete conf.router.config[k];
-              conf.router.config[k.toLowerCase()] = _yakuza._.cloneDeep(v);
+              return v;
             });
 
             // env
@@ -734,62 +732,71 @@ var render = function () {
             });
 
             if (!conf.server.edas.enabled) {
-              _context2.next = 27;
+              _context2.next = 33;
               break;
             }
 
             _context2.prev = 15;
+
+            console.log(1);
             client = new _acmSdk2.default(conf.server.edas.options);
-            _context2.next = 19;
+
+            console.log(2);
+            _context2.next = 21;
             return client.getConfig(conf.server.edas.dataId, conf.server.edas.group);
 
-          case 19:
+          case 21:
             content = _context2.sent;
+
+            console.log(3, content);
             acmConf = JSON.parse(content);
 
+            console.log(4, acmConf);
             setConf(acmConf);
-            _context2.next = 27;
+            console.log(5, conf);
+            _context2.next = 33;
             break;
 
-          case 24:
-            _context2.prev = 24;
+          case 29:
+            _context2.prev = 29;
             _context2.t0 = _context2['catch'](15);
 
+            console.log(6, _context2.t0);
             console.log(_context2.t0);
 
-          case 27:
+          case 33:
             _context2.t1 = conf.dkyMode;
-            _context2.next = _context2.t1 === "dev" ? 30 : _context2.t1 === "normal" ? 33 : _context2.t1 === "prod" ? 36 : _context2.t1 === "stupid" ? 42 : _context2.t1 === "tire" ? 50 : 56;
+            _context2.next = _context2.t1 === "dev" ? 36 : _context2.t1 === "normal" ? 39 : _context2.t1 === "prod" ? 42 : _context2.t1 === "stupid" ? 48 : _context2.t1 === "tire" ? 56 : 62;
             break;
 
-          case 30:
+          case 36:
             // conf.security.encrypt = "none";
             // conf.security.stupid = false;
             // conf.security.helmet = true;
             // conf.server.f5Offline = false;
             conf.security.isDev = true;
             conf.dev = true;
-            return _context2.abrupt('break', 56);
+            return _context2.abrupt('break', 62);
 
-          case 33:
+          case 39:
             // conf.security.encrypt = "none";
             // conf.security.stupid = false;
             // conf.security.helmet = true;
             // conf.server.f5Offline = false;
             conf.security.isNormal = true;
             conf.dev = false;
-            return _context2.abrupt('break', 56);
+            return _context2.abrupt('break', 62);
 
-          case 36:
+          case 42:
             conf.security.encrypt = "sm";
             conf.security.stupid = false;
             conf.security.helmet = true;
             // conf.server.f5Offline = false;
             conf.security.isProd = true;
             conf.dev = false;
-            return _context2.abrupt('break', 56);
+            return _context2.abrupt('break', 62);
 
-          case 42:
+          case 48:
             conf.security.encrypt = "sm";
             conf.security.stupid = true;
             conf.security.helmet = true;
@@ -798,18 +805,18 @@ var render = function () {
             conf.server.csp.enabled = true;
             conf.server.sri.enabled = true;
             conf.dev = false;
-            return _context2.abrupt('break', 56);
+            return _context2.abrupt('break', 62);
 
-          case 50:
+          case 56:
             conf.security.encrypt = "none";
             conf.security.stupid = false;
             conf.security.helmet = false;
             // conf.server.f5Offline = false;
             conf.security.isTire = true;
             conf.dev = false;
-            return _context2.abrupt('break', 56);
+            return _context2.abrupt('break', 62);
 
-          case 56:
+          case 62:
 
             // conf.router.config['app.examples'].enabled = true;
             if (conf.server.yk4Addr) {
@@ -909,7 +916,7 @@ var render = function () {
             conf.server.csp.directives = directives;
 
             // const appPortUsed = [];
-            _context2.next = 77;
+            _context2.next = 83;
             return _yakuza._.asyncMap(conf.router.config, function () {
               var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(v, key) {
                 var name, arr, length, num;
@@ -1092,7 +1099,7 @@ var render = function () {
               };
             }());
 
-          case 77:
+          case 83:
             // console.log(conf.router.config);
 
             conf.shareRule.app = conf.shareRule.app.map(function (ap) {
@@ -1214,12 +1221,12 @@ var render = function () {
 
             return _context2.abrupt('return', { conf: conf });
 
-          case 88:
+          case 94:
           case 'end':
             return _context2.stop();
         }
       }
-    }, _callee2, undefined, [[15, 24]]);
+    }, _callee2, undefined, [[15, 29]]);
   }));
 
   return function render(_x) {