yakuza0 2.22.24 → 2.22.25

package/cli/index.js

@@ -29,6 +29,10 @@ var _inclusive = require('../utils/inclusive.js');
 
 var _inclusive2 = _interopRequireDefault(_inclusive);
 
+var _compress = require('../utils/compress.js');
+
+var _compress2 = _interopRequireDefault(_compress);
+
 var _commander = require('commander');
 
 var _commander2 = _interopRequireDefault(_commander);
@@ -217,10 +221,10 @@ var execCmd = function execCmd(cmd) {
 };
 
 var run = exports.run = function () {
-  var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(_argv) {
-    return _regenerator2.default.wrap(function _callee16$(_context16) {
+  var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee17(_argv) {
+    return _regenerator2.default.wrap(function _callee17$(_context17) {
       while (1) {
-        switch (_context16.prev = _context16.next) {
+        switch (_context17.prev = _context17.next) {
           case 0:
             _commander2.default.version(_package2.default.version, '-v, --version');
 
@@ -632,56 +636,72 @@ var run = exports.run = function () {
               }, _callee11, undefined);
             })));
 
+            _commander2.default.command('cr').description('Code screening secondary compression').action((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12() {
+              return _regenerator2.default.wrap(function _callee12$(_context12) {
+                while (1) {
+                  switch (_context12.prev = _context12.next) {
+                    case 0:
+                      _context12.next = 2;
+                      return (0, _compress2.default)();
+
+                    case 2:
+                    case 'end':
+                      return _context12.stop();
+                  }
+                }
+              }, _callee12, undefined);
+            })));
+
             _commander2.default.command('verify <cmd>').option('-ed, --edit <envName>', 'commit file').option('-m, --msg <msg>', 'commit msg').option('-y0ba, --yk0-build-app <appName>', 'Building a specified application').option('-e, --env <envName>', 'yk server env').description('husky').action(function () {
-              var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(cmd, _ref18) {
-                var edit = _ref18.edit,
-                    msg = _ref18.msg,
-                    yk0BuildApp = _ref18.yk0BuildApp,
-                    env = _ref18.env;
-                return _regenerator2.default.wrap(function _callee12$(_context12) {
+              var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(cmd, _ref19) {
+                var edit = _ref19.edit,
+                    msg = _ref19.msg,
+                    yk0BuildApp = _ref19.yk0BuildApp,
+                    env = _ref19.env;
+                return _regenerator2.default.wrap(function _callee13$(_context13) {
                   while (1) {
-                    switch (_context12.prev = _context12.next) {
+                    switch (_context13.prev = _context13.next) {
                       case 0:
                         alias({ appName: "__common" });
 
                         if (!(cmd !== "commit-init")) {
-                          _context12.next = 4;
+                          _context13.next = 4;
                           break;
                         }
 
-                        _context12.next = 4;
+                        _context13.next = 4;
                         return gi({ app: yk0BuildApp, ykServerEnv: env, appsNoneExit: false });
 
                       case 4:
-                        _context12.t0 = cmd;
-                        _context12.next = _context12.t0 === "commit-init" ? 7 : 8;
+                        _context13.t0 = cmd;
+                        _context13.next = _context13.t0 === "commit-init" ? 7 : 8;
                         break;
 
                       case 7:
-                        return _context12.abrupt('break', 14);
+                        return _context13.abrupt('break', 14);
 
                       case 8:
-                        _context12.next = 10;
+                        _context13.next = 10;
                         return (0, _verify.commitEsLint)({ edit: edit });
 
                       case 10:
-                        _context12.next = 12;
+                        _context13.next = 12;
                         return (0, _verify.commitStyleLint)({ edit: edit });
 
                       case 12:
-                        _context12.next = 14;
+                        _context13.next = 14;
                         return (0, _verify.commitMsg)({ edit: msg });
 
                       case 14:
                       case 'end':
-                        return _context12.stop();
+                        return _context13.stop();
                     }
                   }
-                }, _callee12, undefined);
+                }, _callee13, undefined);
               }));
 
               return function (_x11, _x12) {
-                return _ref19.apply(this, arguments);
+                return _ref20.apply(this, arguments);
               };
             }()
             // case "commit-eslint":
@@ -696,78 +716,78 @@ var run = exports.run = function () {
             );
 
             _commander2.default.command('server <cmd>').alias('s').option('-y0ba, --yk0-build-app <appName>', 'Building a specified application').option('-e, --env <envName>', 'yk server env').description('service control').action(function () {
-              var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(cmd, _ref20) {
-                var yk0BuildApp = _ref20.yk0BuildApp,
-                    env = _ref20.env;
+              var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(cmd, _ref21) {
+                var yk0BuildApp = _ref21.yk0BuildApp,
+                    env = _ref21.env;
 
-                var _ref22, apps;
+                var _ref23, apps;
 
-                return _regenerator2.default.wrap(function _callee14$(_context14) {
+                return _regenerator2.default.wrap(function _callee15$(_context15) {
                   while (1) {
-                    switch (_context14.prev = _context14.next) {
+                    switch (_context15.prev = _context15.next) {
                       case 0:
                         if (!(_os2.default.platform() === 'win32')) {
-                          _context14.next = 3;
+                          _context15.next = 3;
                           break;
                         }
 
                         _consola2.default.error(_msg.errMsg['os.win32.cmd.server']);
-                        return _context14.abrupt('return');
+                        return _context15.abrupt('return');
 
                       case 3:
                         process.env.NODE_ENV = 'production';
                         process.env.NODE_CMD = 'server ' + cmd;
-                        _context14.next = 7;
+                        _context15.next = 7;
                         return gi({ app: yk0BuildApp, ykServerEnv: env });
 
                       case 7:
-                        _ref22 = _context14.sent;
-                        apps = _ref22.apps;
+                        _ref23 = _context15.sent;
+                        apps = _ref23.apps;
 
                         if (!['start', 'stop', 'restart', 'lite', 'container'].includes(cmd)) {
-                          _context14.next = 21;
+                          _context15.next = 21;
                           break;
                         }
 
-                        _context14.t0 = cmd;
-                        _context14.next = _context14.t0 === 'lite' ? 13 : 17;
+                        _context15.t0 = cmd;
+                        _context15.next = _context15.t0 === 'lite' ? 13 : 17;
                         break;
 
                       case 13:
                         alias({ appName: apps[0] });
-                        _context14.next = 16;
+                        _context15.next = 16;
                         return require(params.serverLite)(cmd);
 
                       case 16:
-                        return _context14.abrupt('break', 19);
+                        return _context15.abrupt('break', 19);
 
                       case 17:
-                        _context14.next = 19;
+                        _context15.next = 19;
                         return _server._.asyncMap(apps, function () {
-                          var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(key, j) {
-                            return _regenerator2.default.wrap(function _callee13$(_context13) {
+                          var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(key, j) {
+                            return _regenerator2.default.wrap(function _callee14$(_context14) {
                               while (1) {
-                                switch (_context13.prev = _context13.next) {
+                                switch (_context14.prev = _context14.next) {
                                   case 0:
                                     alias({ appName: key });
-                                    _context13.next = 3;
+                                    _context14.next = 3;
                                     return require(params.serverPath)(cmd, key, j !== apps.length - 1);
 
                                   case 3:
                                   case 'end':
-                                    return _context13.stop();
+                                    return _context14.stop();
                                 }
                               }
-                            }, _callee13, undefined);
+                            }, _callee14, undefined);
                           }));
 
                           return function (_x15, _x16) {
-                            return _ref23.apply(this, arguments);
+                            return _ref24.apply(this, arguments);
                           };
                         }());
 
                       case 19:
-                        _context14.next = 23;
+                        _context15.next = 23;
                         break;
 
                       case 21:
@@ -776,14 +796,14 @@ var run = exports.run = function () {
 
                       case 23:
                       case 'end':
-                        return _context14.stop();
+                        return _context15.stop();
                     }
                   }
-                }, _callee14, undefined);
+                }, _callee15, undefined);
               }));
 
               return function (_x13, _x14) {
-                return _ref21.apply(this, arguments);
+                return _ref22.apply(this, arguments);
               };
             }()).on('--help', function () {
               console.log('');
@@ -795,29 +815,29 @@ var run = exports.run = function () {
             });
 
             _commander2.default.command('publish').alias('pub').description('Publish to server').action(function () {
-              var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(env, options) {
-                return _regenerator2.default.wrap(function _callee15$(_context15) {
+              var _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(env, options) {
+                return _regenerator2.default.wrap(function _callee16$(_context16) {
                   while (1) {
-                    switch (_context15.prev = _context15.next) {
+                    switch (_context16.prev = _context16.next) {
                       case 0:
                         process.env.NODE_TYPE = 'publish';
-                        _context15.next = 3;
+                        _context16.next = 3;
                         return gi();
 
                       case 3:
-                        _context15.next = 5;
+                        _context16.next = 5;
                         return require('../utils/deployment')();
 
                       case 5:
                       case 'end':
-                        return _context15.stop();
+                        return _context16.stop();
                     }
                   }
-                }, _callee15, undefined);
+                }, _callee16, undefined);
               }));
 
               return function (_x17, _x18) {
-                return _ref24.apply(this, arguments);
+                return _ref25.apply(this, arguments);
               };
             }());
 
@@ -828,12 +848,12 @@ var run = exports.run = function () {
 
             _commander2.default.parse(process.argv);
 
-          case 14:
+          case 15:
           case 'end':
-            return _context16.stop();
+            return _context17.stop();
         }
       }
-    }, _callee16, undefined);
+    }, _callee17, undefined);
   }));
 
   return function run(_x3) {

package/config/paths.js

@@ -173,6 +173,7 @@ exports.default = {
   resolveApp: resolveApp,
   appBuildDir: appBuildDir,
   appPath: resolveApp('.'),
+  ykServerPath: resolveApp('.ykServer'),
   appDist: resolveApp('dist'),
   appPackageJson: resolveApp('package.json'),
   appTsConfig: resolveApp('tsconfig.json'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yakuza0",
-  "version": "2.22.24",
+  "version": "2.22.25",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {
@@ -22,8 +22,8 @@
   "license": "MIT",
   "dependencies": {
     "@alicloud/acm-sdk": "^1.0.1",
-    "@babel/plugin-transform-runtime": "^7.12.10",
     "@babel/plugin-proposal-private-property-in-object": "7.21.11",
+    "@babel/plugin-transform-runtime": "^7.12.10",
     "@commitlint/config-conventional": "^12.1.1",
     "@commitlint/format": "^12.1.1",
     "@commitlint/lint": "^12.1.1",
@@ -110,6 +110,7 @@
     "sync-request": "^6.1.0",
     "tcp-port-used": "^1.0.1",
     "ua-parser-js": "^0.7.20",
+    "uglify-js": "^3.17.4",
     "v8-compile-cache": "^2.0.2",
     "yakuza1": "^2.6.14"
   },
@@ -118,5 +119,6 @@
     "core-js": "3.10.1",
     "eslint": "7.2.0",
     "yakuza1": "^2.6.14"
-  }
+  },
+  "__npminstall_done": false
 }

package/utils/compress.js

@@ -0,0 +1,81 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _regenerator = require('babel-runtime/regenerator');
+
+var _regenerator2 = _interopRequireDefault(_regenerator);
+
+var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
+
+var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
+
+var _stringify = require('babel-runtime/core-js/json/stringify');
+
+var _stringify2 = _interopRequireDefault(_stringify);
+
+var _paths = require('../config/paths');
+
+var _paths2 = _interopRequireDefault(_paths);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var fs = require('fs');
+var UglifyJS = require('uglify-js');
+
+
+function convertToJsonOneLine(filePath) {
+  var data = fs.readFileSync(filePath, 'utf-8');
+  var jsonData = JSON.parse(data);
+  var jsonString = (0, _stringify2.default)(jsonData);
+
+  fs.writeFileSync(filePath, jsonString);
+}
+
+// 压缩目录内的所有js文件
+function compressFiles(dir) {
+  fs.readdir(dir, function (err, files) {
+    if (err) throw err;
+
+    files.forEach(function (file) {
+      var filePath = dir + '/' + file;
+
+      fs.stat(filePath, function (err, stats) {
+        if (err) throw err;
+
+        if (stats.isDirectory()) {
+          // 如果是目录，则递归调用compressFiles函数
+          compressFiles(filePath);
+        } else if (stats.isFile() && file.endsWith('.js')) {
+          // 如果是文件且是js文件，则进行压缩
+          var code = fs.readFileSync(filePath, 'utf-8');
+          var result = UglifyJS.minify(code);
+
+          fs.writeFileSync(filePath, result.code);
+        } else if (stats.isFile() && file.endsWith('.json')) {
+          convertToJsonOneLine(filePath);
+        }
+      });
+    });
+  });
+}
+
+// 压缩当前目录
+exports.default = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
+  return _regenerator2.default.wrap(function _callee$(_context) {
+    while (1) {
+      switch (_context.prev = _context.next) {
+        case 0:
+          console.log('Code detection, secondary compression, after the compression is completed, the code in .ykServer can be submitted for detection.');
+          compressFiles(_paths2.default.ykServerPath);
+
+        case 2:
+        case 'end':
+          return _context.stop();
+      }
+    }
+  }, _callee, undefined);
+}));
+module.exports = exports['default'];