yakuza0 2.20.3 → 2.20.7

package/cli/index.js

@@ -433,9 +433,10 @@ var run = exports.run = function () {
               }, _callee9, undefined);
             })));
 
-            _commander2.default.command('verify <cmd>').option('-e, --edit <envName>', 'commit msg').option('-y0ba, --yk0-build-app <appName>', 'Building a specified application').option('-e, --env <envName>', 'yk server env').description('husky').action(function () {
+            _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 _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(cmd, _ref16) {
                 var edit = _ref16.edit,
+                    msg = _ref16.msg,
                     yk0BuildApp = _ref16.yk0BuildApp,
                     env = _ref16.env;
                 return _regenerator2.default.wrap(function _callee10$(_context10) {
@@ -452,7 +453,7 @@ var run = exports.run = function () {
 
                       case 3:
                         _context10.t0 = cmd;
-                        _context10.next = _context10.t0 === "commit-init" ? 6 : _context10.t0 === "commit-eslint" ? 9 : _context10.t0 === "commit-msg" ? 12 : 15;
+                        _context10.next = _context10.t0 === "commit-init" ? 6 : 9;
                         break;
 
                       case 6:
@@ -467,14 +468,12 @@ var run = exports.run = function () {
                         return (0, _verify.commitEsLint)({ edit: edit });
 
                       case 11:
-                        return _context10.abrupt('break', 15);
-
-                      case 12:
-                        _context10.next = 14;
-                        return (0, _verify.commitMsg)({ edit: edit });
+                        _context10.next = 13;
+                        return (0, _verify.commitStyleLint)({ edit: edit });
 
-                      case 14:
-                        return _context10.abrupt('break', 15);
+                      case 13:
+                        _context10.next = 15;
+                        return (0, _verify.commitMsg)({ edit: msg });
 
                       case 15:
                       case 'end':
@@ -487,7 +486,17 @@ var run = exports.run = function () {
               return function (_x10, _x11) {
                 return _ref17.apply(this, arguments);
               };
-            }());
+            }()
+            // case "commit-eslint":
+            //   await commitEsLint({edit});
+            //   break;
+            // case "commit-stylelint":
+            //   await commitStyleLint({edit});
+            //   break;
+            // case "commit-msg":
+            //   await commitMsg({edit});
+            //   break;
+            );
 
             _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 _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(cmd, _ref18) {

package/nuxt/build/index.js

@@ -60,12 +60,13 @@ _yakuza.global.NUXT_BUILD_FILENAME_INDEX = 0;
 
 exports.default = function (config) {
   var nuxtConf = _config2.default.nuxt;
+  var appConf = config.appConf;
   var extendFn = function extendFn(conf, ctx) {};
 
   config.build = (0, _extends3.default)({}, config.build, {
-    extractCSS: {
-      ignoreOrder: false
-    },
+    // extractCSS: {
+    //   ignoreOrder: false,
+    // },
     // extractCSS: !yConf.dev,
     corejs: _config2.default.resolve.babelConf.corejs,
     transpile: [_yakuza._.regAnd(['@rdc', 'ant-design-vue']), _yakuza._.regAnd(['.cache', 'yakuza0', 'middleware']), 'nuxt', 'delay', 'node-fetch', 'data-uri-to-buffer', 'fetch-blob', 'quill-image-drop-module'].concat((0, _toConsumableArray3.default)(nuxtConf.build && nuxtConf.build.tsl || [])),
@@ -78,7 +79,9 @@ exports.default = function (config) {
 
   // config.build.extractCSS = true;
   if (!_config2.default.dev) {
-    // config.build.extractCSS = true;
+    config.build.extractCSS = {
+      ignoreOrder: false
+    };
     // config.build.optimization = {
     //   splitChunks: {
     //     chunks: 'async',
@@ -169,6 +172,24 @@ exports.default = function (config) {
         }
       }
     });
+
+    // if (!appConf.server.openHmr) {
+    //   const hmrIndex = conf.plugins.findIndex(p => {
+    //     return p.constructor.name === 'HotModuleReplacementPlugin';
+    //   });
+    //
+    //   if (hmrIndex !== -1) {
+    //     conf.plugins.splice(hmrIndex, 1)
+    //   }
+    //
+    //   conf.plugins.forEach(p => {
+    //     console.log(p.constructor.name);
+    //   });
+    // }
+
+    if (ctx.loaders && ctx.loaders.scss) {
+      ctx.loaders.scss.additionalData = '@use "sass:math";\n@use "sass:color";\n@use "sass:list";\n@use "sass:map";\n@use "sass:meta";\n@use "sass:selector";\n@use "sass:string";\n';
+    }
   };
 
   // config.build.vendor = ['babel-polyfill'];
@@ -200,7 +221,7 @@ exports.default = function (config) {
     // parallel: true,
     // cache: false,
     // hardSource: false,
-    // cache: yConf.dev,
+    cache: _config2.default.dev,
     hardSource: _config2.default.dev,
     "html.minify": {
       sortAttributes: true,

package/nuxt/buildModules/logger.js

@@ -0,0 +1,5 @@
+'use strict';
+
+var consola = require('consola');
+
+module.exports = consola.withScope('yk:stylelint');

package/nuxt/buildModules/stylelint.js

@@ -0,0 +1,58 @@
+'use strict';
+
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
+var _paths = require('../../config/paths');
+
+var _paths2 = _interopRequireDefault(_paths);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// const { resolve } = require('path')
+var _require = require('./utils'),
+    moduleExists = _require.moduleExists;
+
+var logger = require('./logger');
+
+
+module.exports = function (moduleOptions) {
+  if (!moduleExists('stylelint')) {
+    logger.warn('The dependency `stylelint` not found.', 'Please run `pxnpm install stylelint --save-dev` or `npm install stylelint --save-dev`');
+    return;
+  }
+
+  var options = (0, _extends3.default)({
+    context: this.options.srcDir,
+    // configFile: paths.appDirectory + paths.sep + ".stylelintrc.js",
+    files: [this.options.dir.assets + '/**/*.{s?(a|c)ss,less,stylus}', '{components,' + this.options.dir.layouts + ',' + this.options.dir.pages + '}/**/*.vue']
+  }, this.options.stylelint, moduleOptions);
+
+  var filesToWatch = ['.stylelintignore', '.stylelintrc', '.stylelintrc.json', '.stylelintrc.yaml', '.stylelintrc.yml', '.stylelintrc.js', 'stylelint.config.js'];
+
+  filesToWatch.forEach(function (p) {
+    var v = _paths2.default.appDirectory + _paths2.default.sep + p;
+    if (_paths2.default.access(v)) {
+      options.configFile = v;
+    }
+  });
+
+  // this.options.watch.push(
+  //   ...filesToWatch.map(p => (paths.appDirectory + paths.sep + p))
+  // )
+
+  console.warn = function () {};
+  this.extendBuild(function (config, _ref) {
+    var isDev = _ref.isDev,
+        isClient = _ref.isClient;
+
+    if (isDev && isClient) {
+      var StylelintPlugin = require('stylelint-webpack-plugin');
+
+      config.plugins.push(new StylelintPlugin(options));
+    }
+  });
+};
+
+// module.exports.meta = require('../package.json')

package/nuxt/buildModules/utils.js

@@ -0,0 +1,13 @@
+"use strict";
+
+var moduleExists = function moduleExists(name) {
+  try {
+    return require.resolve(name);
+  } catch (e) /* istanbul ignore next */{
+    return false;
+  }
+};
+
+module.exports = {
+  moduleExists: moduleExists
+};

package/nuxt/store/index.js

@@ -2,10 +2,17 @@
 
 var _yakuza = require('yakuza1');
 
+var _init = require('yakuza0/nuxt/store/init');
+
+var ykInit = _interopRequireWildcard(_init);
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
 var commonStore = require.context('$common.store/', true, /\.js$/);
 var store = require.context('~/store/', true, /\.js$/);
 
 var storeObj = {};
+storeObj['__yk_init__'] = ykInit;
 
 var errStateFile = [];
 

package/nuxt/store/init.js

@@ -0,0 +1,27 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var namespaced = exports.namespaced = true;
+var state = exports.state = function state() {
+  return {
+    gu: {
+      group: '',
+      name: '',
+      ver: ''
+    }
+  };
+};
+var mutations = exports.mutations = {
+  SET_GU: function SET_GU(state, gu) {
+    state.gu = gu;
+  }
+};
+var actions = exports.actions = {
+  setGU: function setGU(_ref, gu) {
+    var commit = _ref.commit;
+
+    commit('SET_GU', gu);
+  }
+};

package/nuxt/style.js

@@ -26,10 +26,22 @@ var _config = require('../config');
 
 var _config2 = _interopRequireDefault(_config);
 
+var _paths = require('../config/paths');
+
+var _paths2 = _interopRequireDefault(_paths);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 exports.default = function (config) {
+  var stylelint = _config2.default.extend.plugins.stylelint;
+
   config.buildModules = ['@rdc/nuxtjs-style-resources'];
+
+  if (stylelint.enabled) {
+    var sm = ['yakuza0/nuxt/buildModules/stylelint', stylelint.options];
+    config.buildModules.push(sm);
+  }
+
   var globalStyle = (0, _extends3.default)({
     compile: [],
     sass: [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yakuza0",
-  "version": "2.20.3",
+  "version": "2.20.7",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {
@@ -27,7 +27,7 @@
     "@commitlint/load": "^12.1.1",
     "@commitlint/read": "^12.1.1",
     "@nuxtjs/eslint-config": "^3.0.0",
-    "@nuxtjs/pwa": "^3.0.0-beta.19",
+    "@nuxtjs/stylelint-module": "^4.0.0",
     "@rdc/nuxt": "2.15.8-0",
     "@rdc/nuxtjs-style-resources": "^1.0.0",
     "address": "^1.0.3",
@@ -72,16 +72,26 @@
     "less": "^3.10.3",
     "less-loader": "^5.0.0",
     "markdown-loader": "^6.0.0",
-    "node-sass": "^4.9.3",
     "node-ssh": "5",
     "path-match": "^1.2.4",
     "pm2": "^4.2.0",
     "react-dev-utils": "^11.0.4",
     "require-from-string": "^2.0.2",
     "rimraf": "^2.6.3",
-    "sass-loader": "^7.1.0",
+    "sass": "^1.43.4",
+    "sass-loader": "^10",
     "semver": "^6.3.0",
     "socket.io-client": "^2.2.0",
+    "stylelint": "^14.1.0",
+    "stylelint-config-prettier": "^9.0.3",
+    "stylelint-config-rational-order": "^0.1.2",
+    "stylelint-config-recommended-vue": "^1.0.0",
+    "stylelint-config-standard": "^24.0.0",
+    "stylelint-config-standard-scss": "^2.0.1",
+    "stylelint-declaration-block-no-ignored-properties": "^2.5.0",
+    "stylelint-order": "^5.0.0",
+    "stylelint-scss": "^4.0.0",
+    "stylelint-webpack-plugin": "^3.1.0",
     "stylus": "^0.54.7",
     "stylus-loader": "^3.0.2",
     "tcp-port-used": "^1.0.1",