yakuza0 2.23.15 → 2.23.16-beta.0

package/package.json

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

package/utils/inclusive.js

@@ -207,7 +207,7 @@ var render = function () {
         ykPkg = _ref.pkg,
         dkyModeDef = _ref.dkyModeDef;
 
-    var _ykConfig, ykConf, processEnv, imageKeyOrigin, aliasDir, yk0EnvStr, conf, cspLoop, setConfValue, setConfCSP, setConf, envBase, envMerge, client, content, acmConf, hostname, port, ykServer, orbAddr, directives, tip, serverConfStr;
+    var _ykConfig, ykConf, processEnv, imageKeyOrigin, aliasDir, yk0EnvStr, conf, cspLoop, setConfValue, setConfCSP, setConf, cspMerge, envBase, envMerge, client, content, acmConf, hostname, port, ykServer, orbAddr, directives, tip, serverConfStr;
 
     return _regenerator2.default.wrap(function _callee2$(_context2) {
       while (1) {
@@ -788,79 +788,87 @@ var render = function () {
               }
             });
 
+            cspMerge = function cspMerge(m1, m2) {
+              var envMerge = (0, _extends3.default)({}, m1);
+
+              _yakuza._.forEach(m2, function (v, key) {
+                envMerge[key] = _yakuza._.uniq(_yakuza._.compact(_yakuza._.concat(envMerge[key], v)));
+              });
+
+              return envMerge;
+            };
+
             if (conf.server.csp.envType !== "def") {
               envBase = conf.server.csp.env['base'] || {};
 
               delete conf.server.csp.env['base'];
-              envMerge = (0, _extends3.default)({}, envBase);
+              envMerge = cspMerge(conf.server.csp.policies, envBase);
 
               _yakuza._.forEach(conf.server.csp.env, function (v, key) {
                 if (key === conf.server.csp.envType) {
-                  _yakuza._.forEach(v, function (ev, ek) {
-                    envMerge[ek] = _yakuza._.uniq(_yakuza._.compact(_yakuza._.concat(ev, envMerge[ek])));
-                  });
+                  envMerge = cspMerge(envMerge, conf.server.csp.env[key] || {});
                 }
               });
-              conf.server.csp.policies = envMerge;
+              conf.server.csp.policies = _yakuza._.cloneDeep(envMerge);
             }
 
             if (!conf.server.edas.enabled) {
-              _context2.next = 29;
+              _context2.next = 30;
               break;
             }
 
-            _context2.prev = 17;
+            _context2.prev = 18;
             client = new _acmSdk2.default(conf.server.edas.options);
-            _context2.next = 21;
+            _context2.next = 22;
             return client.getConfig(conf.server.edas.dataId, conf.server.edas.group);
 
-          case 21:
+          case 22:
             content = _context2.sent;
             acmConf = JSON.parse(content);
 
             setConf(acmConf);
-            _context2.next = 29;
+            _context2.next = 30;
             break;
 
-          case 26:
-            _context2.prev = 26;
-            _context2.t0 = _context2['catch'](17);
+          case 27:
+            _context2.prev = 27;
+            _context2.t0 = _context2['catch'](18);
 
             console.log(_context2.t0);
 
-          case 29:
+          case 30:
             _context2.t1 = conf.dkyMode;
-            _context2.next = _context2.t1 === "dev" ? 32 : _context2.t1 === "normal" ? 36 : _context2.t1 === "prod" ? 40 : _context2.t1 === "stupid" ? 47 : _context2.t1 === "tire" ? 57 : 64;
+            _context2.next = _context2.t1 === "dev" ? 33 : _context2.t1 === "normal" ? 37 : _context2.t1 === "prod" ? 41 : _context2.t1 === "stupid" ? 48 : _context2.t1 === "tire" ? 58 : 65;
             break;
 
-          case 32:
+          case 33:
             // conf.security.encrypt = "none";
             // conf.security.stupid = false;
             // conf.security.helmet = true;
             conf.server.f5Offline = checkBoolSingle(conf.server.f5Offline, false);
             conf.security.isDev = true;
             conf.dev = true;
-            return _context2.abrupt('break', 64);
+            return _context2.abrupt('break', 65);
 
-          case 36:
+          case 37:
             // conf.security.encrypt = "none";
             // conf.security.stupid = false;
             // conf.security.helmet = true;
             conf.server.f5Offline = checkBoolSingle(conf.server.f5Offline, false);
             conf.security.isNormal = true;
             conf.dev = false;
-            return _context2.abrupt('break', 64);
+            return _context2.abrupt('break', 65);
 
-          case 40:
+          case 41:
             conf.security.encrypt = "sm";
             conf.security.stupid = false;
             conf.security.helmet = true;
             conf.server.f5Offline = checkBoolSingle(conf.server.f5Offline, false);
             conf.security.isProd = true;
             conf.dev = false;
-            return _context2.abrupt('break', 64);
+            return _context2.abrupt('break', 65);
 
-          case 47:
+          case 48:
             conf.security.encrypt = "sm";
             conf.security.stupid = true;
             conf.security.helmet = true;
@@ -871,9 +879,9 @@ var render = function () {
             conf.server.csp.decoration = checkBoolSingle(conf.server.csp.decoration, true);
             conf.server.sri.enabled = true;
             // conf.dev = false;
-            return _context2.abrupt('break', 64);
+            return _context2.abrupt('break', 65);
 
-          case 57:
+          case 58:
             conf.security.encrypt = "none";
             conf.security.stupid = false;
             conf.security.helmet = false;
@@ -882,9 +890,9 @@ var render = function () {
             // conf.server.heartbeat.enabled = checkBoolSingle(conf.server.heartbeat.enabled, false);
             conf.server.heartbeat.enabled = false;
             // conf.dev = false;
-            return _context2.abrupt('break', 64);
+            return _context2.abrupt('break', 65);
 
-          case 64:
+          case 65:
 
             conf.server.stupid.v23.enabled = conf.server.stupid.standard === 'v23';
             // conf.router.config['app.examples'].enabled = true;
@@ -987,7 +995,7 @@ var render = function () {
             conf.server.csp.directives = directives;
 
             // const appPortUsed = [];
-            _context2.next = 86;
+            _context2.next = 87;
             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;
@@ -1174,7 +1182,7 @@ var render = function () {
               };
             }());
 
-          case 86:
+          case 87:
             // console.log(conf.router.config);
 
             conf.shareRule.app = conf.shareRule.app.map(function (ap) {
@@ -1296,12 +1304,12 @@ var render = function () {
 
             return _context2.abrupt('return', { conf: conf });
 
-          case 97:
+          case 98:
           case 'end':
             return _context2.stop();
         }
       }
-    }, _callee2, undefined, [[17, 26]]);
+    }, _callee2, undefined, [[18, 27]]);
   }));
 
   return function render(_x) {