yakuza0 2.21.3-beta.2 → 2.21.4

package/cli/index.js

@@ -455,39 +455,41 @@ var run = exports.run = function () {
                   while (1) {
                     switch (_context10.prev = _context10.next) {
                       case 0:
+                        alias({ appName: "__common" });
+
                         if (!(cmd !== "commit-init")) {
-                          _context10.next = 3;
+                          _context10.next = 4;
                           break;
                         }
 
-                        _context10.next = 3;
+                        _context10.next = 4;
                         return gi({ app: yk0BuildApp, ykServerEnv: env, appsNoneExit: false });
 
-                      case 3:
+                      case 4:
                         _context10.t0 = cmd;
-                        _context10.next = _context10.t0 === "commit-init" ? 6 : 9;
+                        _context10.next = _context10.t0 === "commit-init" ? 7 : 10;
                         break;
 
-                      case 6:
-                        _context10.next = 8;
+                      case 7:
+                        _context10.next = 9;
                         return (0, _verify.commitInit)();
 
-                      case 8:
-                        return _context10.abrupt('break', 15);
-
                       case 9:
-                        _context10.next = 11;
+                        return _context10.abrupt('break', 16);
+
+                      case 10:
+                        _context10.next = 12;
                         return (0, _verify.commitEsLint)({ edit: edit });
 
-                      case 11:
-                        _context10.next = 13;
+                      case 12:
+                        _context10.next = 14;
                         return (0, _verify.commitStyleLint)({ edit: edit });
 
-                      case 13:
-                        _context10.next = 15;
+                      case 14:
+                        _context10.next = 16;
                         return (0, _verify.commitMsg)({ edit: msg });
 
-                      case 15:
+                      case 16:
                       case 'end':
                         return _context10.stop();
                     }

package/config/paths.js

@@ -104,6 +104,8 @@ var ykCert = ykRoot + ('cert' + path.sep);
 var cacheDir = appNodeModules + (path.sep + '.cache');
 var ykCacheDir = cacheDir + (path.sep + 'yakuza0');
 var ykRootCacheDir = ykRoot + '.cache';
+var ykRootCacheDirCommonDir = ykRootCacheDir + (path.sep + '__common');
+var ykRootCacheDirCommonConf = ykRootCacheDirCommonDir + (path.sep + 'config.json');
 var ykCacheTmpDir = ykCacheDir + (path.sep + 'tmp');
 var ykCacheAppDir = ykCacheDir + (path.sep + 'app');
 var ykCacheTmpPub = ykCacheTmpDir + (path.sep + 'pub');
@@ -176,6 +178,8 @@ exports.default = {
   appAtSameDir: appDirectory + (path.sep + '..' + path.sep),
   ykCacheDir: ykCacheDir,
   ykRootCacheDir: ykRootCacheDir,
+  ykRootCacheDirCommonDir: ykRootCacheDirCommonDir,
+  ykRootCacheDirCommonConf: ykRootCacheDirCommonConf,
   ykCacheTmpDir: ykCacheTmpDir,
   ykCacheAppDir: ykCacheAppDir,
   ykCacheTmpPub: ykCacheTmpPub,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yakuza0",
-  "version": "2.21.3-beta.2",
+  "version": "2.21.4",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {
@@ -34,7 +34,6 @@
     "address": "^1.0.3",
     "async-redis": "^1.1.4",
     "babel-core": "^6.26.0",
-    "babel-eslint": "^10.1.0",
     "babel-helper-vue-jsx-merge-props": "^2.0.0",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-import": "^1.13.1",
@@ -77,7 +76,7 @@
     "node-ssh": "5",
     "path-match": "^1.2.4",
     "pm2": "^4.2.0",
-    "postcss": "^8.4.5",
+    "postcss": "8.3.11",
     "postcss-import": "^13.0.0",
     "postcss-loader": "^4.3.0",
     "postcss-url": "^10.1.3",

package/utils/inclusive.js

@@ -75,9 +75,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 var appDirectory = _paths2.default.appDirectory,
     ykConfigJs = _paths2.default.ykConfigJs,
-    ykConfigJson = _paths2.default.ykConfigJson,
     ykConfigJsonClient = _paths2.default.ykConfigJsonClient,
-    ykConfigJsonServer = _paths2.default.ykConfigJsonServer,
+    ykRootCacheDirCommonDir = _paths2.default.ykRootCacheDirCommonDir,
+    ykRootCacheDirCommonConf = _paths2.default.ykRootCacheDirCommonConf,
     path = _paths2.default.path,
     mkdir = _paths2.default.mkdir,
     read = _paths2.default.read,
@@ -188,7 +188,7 @@ var render = function () {
         ykPkg = _ref.pkg,
         dkyModeDef = _ref.dkyModeDef;
 
-    var _ykConfig, ykConf, processEnv, aliasDir, conf, cspLoop, setConfValue, setConfCSP, setConf, hostname, port, ykServer, orbAddr, directives, tip;
+    var _ykConfig, ykConf, processEnv, aliasDir, conf, cspLoop, setConfValue, setConfCSP, setConf, hostname, port, ykServer, orbAddr, directives, tip, serverConfStr;
 
     return _regenerator2.default.wrap(function _callee2$(_context2) {
       while (1) {
@@ -497,7 +497,9 @@ var render = function () {
                     stylelint: {
                       test: ['vue'],
                       enabled: true,
-                      options: {}
+                      options: {},
+                      include: [],
+                      exclude: []
                     },
                     commitlint: {
                       enabled: true,
@@ -1082,6 +1084,8 @@ var render = function () {
             // })
             // const scKey = md5(confStr).substring(2, 8);
 
+            serverConfStr = '';
+
             _yakuza._.forEach(conf.router.config, function (v, k) {
               if (v.enabled) {
                 conf.proxyServer = v.proxyServer;
@@ -1110,13 +1114,14 @@ var render = function () {
                 mkdir(ycp.dir);
                 _fs2.default.writeFileSync(ycp.confClient, 'var __cln_init__ = "' + clientConfStrTrans + '"', 'utf8');
 
-                var serverConfStr = (0, _stringify2.default)({ es: serverConfCipher });
+                serverConfStr = (0, _stringify2.default)({ es: serverConfCipher });
                 var serverConfStrTrans = _encrypt.mixin.symmetry.CBC.encrypt(serverConfStr, _encrypt.mixin.getKey(scKey));
                 _fs2.default.writeFileSync(ycp.conf, serverConfStr, 'utf8');
                 _fs2.default.writeFileSync(ycp.confServer, serverConfStrTrans, 'utf8');
               }
             });
-
+            mkdir(ykRootCacheDirCommonDir);
+            _fs2.default.writeFileSync(ykRootCacheDirCommonConf, serverConfStr, 'utf8');
             // const serverConfStr = JSON.stringify({es: serverConfCipher})
             // const serverConfStrTrans = mixin.symmetry.CBC.encrypt(serverConfStr, mixin.getKey(scKey))
             // fs.writeFileSync(ykConfigJson, serverConfStr, 'utf8');
@@ -1129,7 +1134,7 @@ var render = function () {
 
             return _context2.abrupt('return', { conf: conf });
 
-          case 70:
+          case 73:
           case 'end':
             return _context2.stop();
         }