yakuza0 2.21.1-beta.2 → 2.21.1

package/cli/index.js

@@ -87,13 +87,14 @@ var gi = function () {
   var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
-    var app, ykServerEnv, enabledAll, appsNoneExit, apps, _ref2, conf;
+    var app, dkyMode, ykServerEnv, enabledAll, appsNoneExit, apps, _ref2, conf;
 
     return _regenerator2.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             app = options.app || process.env.npm_config_yk0_build_app || process.env.npm_config_y0ba;
+            dkyMode = process.env.NODE_ENV === 'development' ? 'dev' : 'normal';
             ykServerEnv = process.env.YK_SERVER_ENV || options.ykServerEnv || 'local';
             enabledAll = process.env.YK_MACHINE_TYPE === 'workstation';
             appsNoneExit = typeof options.appsNoneExit === 'boolean' ? options.appsNoneExit : true;
@@ -116,15 +117,16 @@ var gi = function () {
               _rimraf2.default.sync(p);
             });
 
-            _context.next = 10;
+            _context.next = 11;
             return (0, _inclusive2.default)({
               apps: apps,
               enabledAll: enabledAll,
               ykServerEnv: ykServerEnv,
-              pkg: _package2.default
+              pkg: _package2.default,
+              dkyMode: dkyMode
             });
 
-          case 10:
+          case 11:
             _ref2 = _context.sent;
             conf = _ref2.conf;
 
@@ -136,7 +138,8 @@ var gi = function () {
                   apps: apps,
                   enabledAll: enabledAll,
                   ykServerEnv: ykServerEnv,
-                  pkg: _package2.default
+                  pkg: _package2.default,
+                  dkyMode: 'dev'
                 }).then();
               }, { event: "change" });
             }
@@ -155,7 +158,7 @@ var gi = function () {
             }
             return _context.abrupt('return', { conf: conf, apps: apps });
 
-          case 16:
+          case 17:
           case 'end':
             return _context.stop();
         }

package/nuxt/style.js

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

package/package.json

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

package/utils/inclusive.js

@@ -185,7 +185,8 @@ var render = function () {
     var apps = _ref.apps,
         enabledAll = _ref.enabledAll,
         ykServerEnv = _ref.ykServerEnv,
-        ykPkg = _ref.pkg;
+        ykPkg = _ref.pkg,
+        dkyMode = _ref.dkyMode;
 
     var _ykConfig, ykConf, processEnv, aliasDir, conf, cspLoop, setConfValue, setConfCSP, setConf, hostname, port, ykServer, orbAddr, directives, tip;
 
@@ -202,7 +203,7 @@ var render = function () {
               ak: 'ak_TjfAV7I',
               name: pkg.name,
               group: '',
-              dev: processEnv.NODE_ENV === 'development',
+              dev: dkyMode === 'dev',
               cmd: process.env.NODE_CMD,
               processKey: '.' + (0, _yakuza.md5)(appDirectory).substring(2, 18),
               imageKey: (0, _yakuza.md5)((processEnv.YK_DOCKERNAME || '').toString()),
@@ -214,7 +215,7 @@ var render = function () {
               fe: 'none',
               standAlone: false,
               mode: 'ssr',
-              dkyMode: "dev",
+              dkyMode: dkyMode || "normal",
               backgroundTest: false,
               https: false,
               variable: _def.variable,
@@ -689,7 +690,7 @@ var render = function () {
             });
 
             _context2.t0 = conf.dkyMode;
-            _context2.next = _context2.t0 === "dev" ? 16 : _context2.t0 === "prod" ? 18 : _context2.t0 === "stupid" ? 23 : _context2.t0 === "tire" ? 30 : 35;
+            _context2.next = _context2.t0 === "dev" ? 16 : _context2.t0 === "normal" ? 19 : _context2.t0 === "prod" ? 22 : _context2.t0 === "stupid" ? 28 : _context2.t0 === "tire" ? 36 : 42;
             break;
 
           case 16:
@@ -698,17 +699,28 @@ var render = function () {
             // conf.security.helmet = true;
             // conf.server.f5Offline = false;
             conf.security.isDev = true;
-            return _context2.abrupt('break', 35);
+            conf.dev = true;
+            return _context2.abrupt('break', 42);
 
-          case 18:
+          case 19:
+            // 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', 42);
+
+          case 22:
             conf.security.encrypt = "sm";
             conf.security.stupid = false;
             conf.security.helmet = true;
             // conf.server.f5Offline = false;
             conf.security.isProd = true;
-            return _context2.abrupt('break', 35);
+            conf.dev = false;
+            return _context2.abrupt('break', 42);
 
-          case 23:
+          case 28:
             conf.security.encrypt = "sm";
             conf.security.stupid = true;
             conf.security.helmet = true;
@@ -716,17 +728,19 @@ var render = function () {
             conf.security.isStupid = true;
             conf.server.csp.enabled = true;
             conf.server.sri.enabled = true;
-            return _context2.abrupt('break', 35);
+            conf.dev = false;
+            return _context2.abrupt('break', 42);
 
-          case 30:
+          case 36:
             conf.security.encrypt = "none";
             conf.security.stupid = false;
             conf.security.helmet = false;
             // conf.server.f5Offline = false;
             conf.security.isTire = true;
-            return _context2.abrupt('break', 35);
+            conf.dev = false;
+            return _context2.abrupt('break', 42);
 
-          case 35:
+          case 42:
 
             // conf.router.config['app.examples'].enabled = true;
             if (conf.server.yk4Addr) {
@@ -826,7 +840,7 @@ var render = function () {
             conf.server.csp.directives = directives;
 
             // const appPortUsed = [];
-            _context2.next = 56;
+            _context2.next = 63;
             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;
@@ -1008,7 +1022,7 @@ var render = function () {
               };
             }());
 
-          case 56:
+          case 63:
             // console.log(conf.router.config);
 
             conf.shareRule.app = conf.shareRule.app.map(function (ap) {
@@ -1108,7 +1122,7 @@ var render = function () {
 
             return _context2.abrupt('return', { conf: conf });
 
-          case 63:
+          case 70:
           case 'end':
             return _context2.stop();
         }