@baic/yolk-cli 2.1.0-alpha.222 → 2.1.0-alpha.224

package/es/.lintstagedrc.js

@@ -4,6 +4,7 @@ const {
   getYolkConfig,
   getEsLintConfigPath,
   getStyleLintConfigPath,
+  getPrettierConfigPath,
 } = require('./_util');
 
 const defaultIgnore = [
@@ -28,14 +29,16 @@ const defaultIgnore = [
 const yolkConfig = getYolkConfig();
 const isStrict = yolkConfig.strict !== false;
 
-const prettierCLI =
-  'prettier --write --cache --cache-strategy=content --loglevel=error';
+const cacheDirPath = join(process.cwd(), 'node_modules', '.cache');
+
+const prettierCLI = `prettier --write --cache --cache-strategy=content --cache-location=${join(
+  cacheDirPath,
+  '.prettiercache',
+)} --config ${getPrettierConfigPath()}  --loglevel=error`;
 const eslintCLI = `eslint --fix ${
   isStrict ? '--no-inline-config' : ''
 } --no-error-on-unmatched-pattern --cache --cache-strategy=content --cache-location=${join(
-  process.cwd(),
-  'node_modules',
-  '.cache',
+  cacheDirPath,
   '.eslintcache',
 )} --config ${getEsLintConfigPath()} ${defaultIgnore
   .map((i) => `--ignore-pattern ${i}`)
@@ -43,9 +46,7 @@ const eslintCLI = `eslint --fix ${
 const stylelintCLI = `stylelint --fix ${
   isStrict ? '--ignore-disables' : ''
 } --allow-empty-input --cache --cache-strategy=content --cache-location=${join(
-  process.cwd(),
-  'node_modules',
-  '.cache',
+  cacheDirPath,
   '.stylelintcache',
 )} --config ${getStyleLintConfigPath()} ${defaultIgnore
   .map((i) => `--ignore-pattern ${i}`)

package/es/_util.d.ts

@@ -22,5 +22,7 @@ export declare const getYolkConfig: () => YolkConfig;
 export declare const getPrettierConfig: () => any;
 export declare const getProjectConfigJSON: () => any;
 export declare const getPackageJSON: () => any;
+export declare const getConfigFilePath: (type: 'eslint' | 'stylelint' | 'prettier') => string;
 export declare const getEsLintConfigPath: () => string;
 export declare const getStyleLintConfigPath: () => string;
+export declare const getPrettierConfigPath: () => string;

package/es/_util.js

@@ -1 +1 @@
-import{spawn as r}from"child_process";import e from"fs";import t from"path";import{rimrafSync as o,windowsSync as n}from"@baic/yolk-prebundle/compiled/rimraf";import i from"chalk";import{globSync as c}from"glob";import{program as a}from"../compiled/commander";var s=process.cwd(),f=console;export var ENCODING="utf-8";export var warn=function(r){return r&&f.log(i.yellow("warn  -"),r)};export var error=function(r){return r&&f.log(i.red("error -"),r)};export var ready=function(r){return r&&f.log(i.green("ready -"),r)};export var info=function(r){return r&&f.log(i.blue("info  -"),r)};var l=function(){return"win32"===process.platform},p=function(r){return l()?"".concat(r,".cmd"):r};export var rimrafSync=function(r){return l()?n(r):o(r)};export var completeExit=function(){ready("yolk complete!"),process.exit(0)};export var breakExit=function(){warn("yolk break!"),process.exit(0)};export var execCommand=function(e){var t=e.command,o=e.args,n=e.complete,i=e.close,c=e.exit,s=void 0===c||c,f=r(p(t),o||[],{stdio:"inherit"}).on("close",(function(r){r?(i&&i(),error("yolk close!"),process.exit(r)):(n&&n(),s&&completeExit())}));process.on("SIGINT",(function(){a.exitOverride(),f.kill(),breakExit()}))};export var getYolkConfig=function(){var r=c("*.yolkrc*",{cwd:s,dot:!0});if(!r.length)return{};var o=t.join(s,r[0]);if(!e.existsSync(o))return{};try{return JSON.parse(e.readFileSync(o,ENCODING))||{}}catch(error){return error(error.message||".yolkrc\u8f6c\u6362\u9519\u8bef"),{}}};export var getPrettierConfig=function(){var r=t.join(s,".prettierrc");if(e.existsSync(r))try{return JSON.parse(e.readFileSync(r,ENCODING))||{}}catch(error){return error(error.message||".prettierrc\u8f6c\u6362\u9519\u8bef"),{}}return require("./.prettierrc")};export var getProjectConfigJSON=function(){var r=t.join(s,"project.config.json");if(!e.existsSync(r))return{};try{return JSON.parse(e.readFileSync(r,ENCODING))||{}}catch(error){return error(error.message||"project.config.json\u8f6c\u6362\u9519\u8bef"),{}}};export var getPackageJSON=function(){var r=t.join(s,"package.json");if(!e.existsSync(r))return{};try{return JSON.parse(e.readFileSync(r,ENCODING))||{}}catch(error){return error(error.message||"package.json\u8f6c\u6362\u9519\u8bef"),{}}};export var getEsLintConfigPath=function(){var r=getYolkConfig(),t="";try{t=require.resolve("@baic/eslint-config-yolk")}catch(error){}var o=c("*.eslintrc*",{cwd:s,dot:!0}),n=o[0];return!1===r.strict&&n&&e.existsSync(n)?n:e.existsSync(t)?t:n};export var getStyleLintConfigPath=function(){var r=getYolkConfig(),t="";try{t=require.resolve("@baic/stylelint-config-yolk")}catch(error){}var o=c("*.stylelintrc*",{cwd:s,dot:!0}),n=o[0];return!1===r.strict&&n&&e.existsSync(n)?n:e.existsSync(t)?t:n};
+import{spawn as r}from"child_process";import e from"fs";import t from"path";import{rimrafSync as o,windowsSync as n}from"@baic/yolk-prebundle/compiled/rimraf";import i from"chalk";import{globSync as c}from"glob";import{program as a}from"../compiled/commander";var s=process.cwd(),f=console;export var ENCODING="utf-8";export var warn=function(r){return r&&f.log(i.yellow("warn  -"),r)};export var error=function(r){return r&&f.log(i.red("error -"),r)};export var ready=function(r){return r&&f.log(i.green("ready -"),r)};export var info=function(r){return r&&f.log(i.blue("info  -"),r)};var p=function(){return"win32"===process.platform},u=function(r){return p()?"".concat(r,".cmd"):r};export var rimrafSync=function(r){return p()?n(r):o(r)};export var completeExit=function(){ready("yolk complete!"),process.exit(0)};export var breakExit=function(){warn("yolk break!"),process.exit(0)};export var execCommand=function(e){var t=e.command,o=e.args,n=e.complete,i=e.close,c=e.exit,s=void 0===c||c,f=r(u(t),o||[],{stdio:"inherit"}).on("close",(function(r){r?(i&&i(),error("yolk close!"),process.exit(r)):(n&&n(),s&&completeExit())}));process.on("SIGINT",(function(){a.exitOverride(),f.kill(),breakExit()}))};export var getYolkConfig=function(){var r=c("*.yolkrc*",{cwd:s,dot:!0});if(!r.length)return{};var o=t.join(s,r[0]);if(!e.existsSync(o))return{};try{return JSON.parse(e.readFileSync(o,ENCODING))||{}}catch(error){return error(error.message||".yolkrc\u8f6c\u6362\u9519\u8bef"),{}}};export var getPrettierConfig=function(){var r=t.join(s,".prettierrc");if(e.existsSync(r))try{return JSON.parse(e.readFileSync(r,ENCODING))||{}}catch(error){return error(error.message||".prettierrc\u8f6c\u6362\u9519\u8bef"),{}}return require("./.prettierrc")};export var getProjectConfigJSON=function(){var r=t.join(s,"project.config.json");if(!e.existsSync(r))return{};try{return JSON.parse(e.readFileSync(r,ENCODING))||{}}catch(error){return error(error.message||"project.config.json\u8f6c\u6362\u9519\u8bef"),{}}};export var getPackageJSON=function(){var r=t.join(s,"package.json");if(!e.existsSync(r))return{};try{return JSON.parse(e.readFileSync(r,ENCODING))||{}}catch(error){return error(error.message||"package.json\u8f6c\u6362\u9519\u8bef"),{}}};export var getConfigFilePath=function(r){var t=getYolkConfig(),o="";try{o=require.resolve("@baic/".concat(r,"-config-yolk"))}catch(error){}var n=c("*.".concat(r,"rc*"),{cwd:s,dot:!0}),i=n[0];return!1===t.strict&&i&&e.existsSync(i)?i:e.existsSync(o)?o:i};export var getEsLintConfigPath=function(){return getConfigFilePath("eslint")};export var getStyleLintConfigPath=function(){return getConfigFilePath("stylelint")};export var getPrettierConfigPath=function(){return getConfigFilePath("prettier")};

package/lib/.lintstagedrc.js

@@ -4,6 +4,7 @@ const {
   getYolkConfig,
   getEsLintConfigPath,
   getStyleLintConfigPath,
+  getPrettierConfigPath,
 } = require('./_util');
 
 const defaultIgnore = [
@@ -28,14 +29,16 @@ const defaultIgnore = [
 const yolkConfig = getYolkConfig();
 const isStrict = yolkConfig.strict !== false;
 
-const prettierCLI =
-  'prettier --write --cache --cache-strategy=content --loglevel=error';
+const cacheDirPath = join(process.cwd(), 'node_modules', '.cache');
+
+const prettierCLI = `prettier --write --cache --cache-strategy=content --cache-location=${join(
+  cacheDirPath,
+  '.prettiercache',
+)} --config ${getPrettierConfigPath()}  --loglevel=error`;
 const eslintCLI = `eslint --fix ${
   isStrict ? '--no-inline-config' : ''
 } --no-error-on-unmatched-pattern --cache --cache-strategy=content --cache-location=${join(
-  process.cwd(),
-  'node_modules',
-  '.cache',
+  cacheDirPath,
   '.eslintcache',
 )} --config ${getEsLintConfigPath()} ${defaultIgnore
   .map((i) => `--ignore-pattern ${i}`)
@@ -43,9 +46,7 @@ const eslintCLI = `eslint --fix ${
 const stylelintCLI = `stylelint --fix ${
   isStrict ? '--ignore-disables' : ''
 } --allow-empty-input --cache --cache-strategy=content --cache-location=${join(
-  process.cwd(),
-  'node_modules',
-  '.cache',
+  cacheDirPath,
   '.stylelintcache',
 )} --config ${getStyleLintConfigPath()} ${defaultIgnore
   .map((i) => `--ignore-pattern ${i}`)

package/lib/_util.d.ts

@@ -22,5 +22,7 @@ export declare const getYolkConfig: () => YolkConfig;
 export declare const getPrettierConfig: () => any;
 export declare const getProjectConfigJSON: () => any;
 export declare const getPackageJSON: () => any;
+export declare const getConfigFilePath: (type: 'eslint' | 'stylelint' | 'prettier') => string;
 export declare const getEsLintConfigPath: () => string;
 export declare const getStyleLintConfigPath: () => string;
+export declare const getPrettierConfigPath: () => string;

package/lib/_util.js

@@ -1 +1 @@
-var e=Object.create,r=Object.defineProperty,t=Object.getOwnPropertyDescriptor,o=Object.getOwnPropertyNames,c=Object.getPrototypeOf,n=Object.prototype.hasOwnProperty,l=(e,t)=>{for(var o in t)r(e,o,{get:t[o],enumerable:!0})},i=(e,c,l,i)=>{if(c&&"object"===typeof c||"function"===typeof c)for(let a of o(c))n.call(e,a)||a===l||r(e,a,{get:()=>c[a],enumerable:!(i=t(c,a))||i.enumerable});return e},a=(t,o,n)=>(n=null!=t?e(c(t)):{},i(!o&&t&&t.__esModule?n:r(n,"default",{value:t,enumerable:!0}),t)),s=e=>i(r({},"__esModule",{value:!0}),e),u={};l(u,{ENCODING:()=>O,breakExit:()=>C,completeExit:()=>v,error:()=>k,execCommand:()=>J,getEsLintConfigPath:()=>D,getPackageJSON:()=>I,getPrettierConfig:()=>E,getProjectConfigJSON:()=>F,getStyleLintConfigPath:()=>G,getYolkConfig:()=>_,info:()=>w,ready:()=>h,rimrafSync:()=>P,warn:()=>x}),module.exports=s(u);var f=require("child_process"),d=a(require("fs")),y=a(require("path")),g=require("@baic/yolk-prebundle/compiled/rimraf"),p=a(require("chalk")),m=require("glob"),S=require("../compiled/commander"),b=process.cwd(),j=console,O="utf-8",x=e=>e&&j.log(p.default.yellow("warn  -"),e),k=e=>e&&j.log(p.default.red("error -"),e),h=e=>e&&j.log(p.default.green("ready -"),e),w=e=>e&&j.log(p.default.blue("info  -"),e),q=()=>"win32"===process.platform,N=e=>q()?`${e}.cmd`:e,P=e=>q()?(0,g.windowsSync)(e):(0,g.rimrafSync)(e),v=()=>{h("yolk complete!"),process.exit(0)},C=()=>{x("yolk break!"),process.exit(0)},J=({command:e,args:r,complete:t,close:o,exit:c=!0})=>{const n=(0,f.spawn)(N(e),r||[],{stdio:"inherit"}).on("close",(e=>{e?(o&&o(),k("yolk close!"),process.exit(e)):(t&&t(),c&&v())}));process.on("SIGINT",(()=>{S.program.exitOverride(),n.kill(),C()}))},_=()=>{const e=(0,m.globSync)("*.yolkrc*",{cwd:b,dot:!0});if(!e.length)return{};const r=y.default.join(b,e[0]);if(!d.default.existsSync(r))return{};try{return JSON.parse(d.default.readFileSync(r,O))||{}}catch(t){return t(t.message||".yolkrc\u8f6c\u6362\u9519\u8bef"),{}}},E=()=>{const e=y.default.join(b,".prettierrc");if(d.default.existsSync(e))try{return JSON.parse(d.default.readFileSync(e,O))||{}}catch(r){return r(r.message||".prettierrc\u8f6c\u6362\u9519\u8bef"),{}}return require("./.prettierrc")},F=()=>{const e=y.default.join(b,"project.config.json");if(!d.default.existsSync(e))return{};try{return JSON.parse(d.default.readFileSync(e,O))||{}}catch(r){return r(r.message||"project.config.json\u8f6c\u6362\u9519\u8bef"),{}}},I=()=>{const e=y.default.join(b,"package.json");if(!d.default.existsSync(e))return{};try{return JSON.parse(d.default.readFileSync(e,O))||{}}catch(r){return r(r.message||"package.json\u8f6c\u6362\u9519\u8bef"),{}}},D=()=>{const e=_();let r="";try{r=require.resolve("@baic/eslint-config-yolk")}catch(c){}const t=(0,m.globSync)("*.eslintrc*",{cwd:b,dot:!0}),o=t[0];return!1===e.strict&&o&&d.default.existsSync(o)?o:d.default.existsSync(r)?r:o},G=()=>{const e=_();let r="";try{r=require.resolve("@baic/stylelint-config-yolk")}catch(c){}const t=(0,m.globSync)("*.stylelintrc*",{cwd:b,dot:!0}),o=t[0];return!1===e.strict&&o&&d.default.existsSync(o)?o:d.default.existsSync(r)?r:o};
+var e=Object.create,r=Object.defineProperty,t=Object.getOwnPropertyDescriptor,o=Object.getOwnPropertyNames,n=Object.getPrototypeOf,c=Object.prototype.hasOwnProperty,a=(e,t)=>{for(var o in t)r(e,o,{get:t[o],enumerable:!0})},i=(e,n,a,i)=>{if(n&&"object"===typeof n||"function"===typeof n)for(let l of o(n))c.call(e,l)||l===a||r(e,l,{get:()=>n[l],enumerable:!(i=t(n,l))||i.enumerable});return e},l=(t,o,c)=>(c=null!=t?e(n(t)):{},i(!o&&t&&t.__esModule?c:r(c,"default",{value:t,enumerable:!0}),t)),s=e=>i(r({},"__esModule",{value:!0}),e),u={};a(u,{ENCODING:()=>O,breakExit:()=>v,completeExit:()=>C,error:()=>k,execCommand:()=>J,getConfigFilePath:()=>$,getEsLintConfigPath:()=>D,getPackageJSON:()=>I,getPrettierConfig:()=>_,getPrettierConfigPath:()=>L,getProjectConfigJSON:()=>E,getStyleLintConfigPath:()=>G,getYolkConfig:()=>F,info:()=>w,ready:()=>x,rimrafSync:()=>q,warn:()=>h}),module.exports=s(u);var f=require("child_process"),d=l(require("fs")),g=l(require("path")),p=require("@baic/yolk-prebundle/compiled/rimraf"),y=l(require("chalk")),m=require("glob"),S=require("../compiled/commander"),b=process.cwd(),j=console,O="utf-8",h=e=>e&&j.log(y.default.yellow("warn  -"),e),k=e=>e&&j.log(y.default.red("error -"),e),x=e=>e&&j.log(y.default.green("ready -"),e),w=e=>e&&j.log(y.default.blue("info  -"),e),P=()=>"win32"===process.platform,N=e=>P()?`${e}.cmd`:e,q=e=>P()?(0,p.windowsSync)(e):(0,p.rimrafSync)(e),C=()=>{x("yolk complete!"),process.exit(0)},v=()=>{h("yolk break!"),process.exit(0)},J=({command:e,args:r,complete:t,close:o,exit:n=!0})=>{const c=(0,f.spawn)(N(e),r||[],{stdio:"inherit"}).on("close",(e=>{e?(o&&o(),k("yolk close!"),process.exit(e)):(t&&t(),n&&C())}));process.on("SIGINT",(()=>{S.program.exitOverride(),c.kill(),v()}))},F=()=>{const e=(0,m.globSync)("*.yolkrc*",{cwd:b,dot:!0});if(!e.length)return{};const r=g.default.join(b,e[0]);if(!d.default.existsSync(r))return{};try{return JSON.parse(d.default.readFileSync(r,O))||{}}catch(t){return t(t.message||".yolkrc\u8f6c\u6362\u9519\u8bef"),{}}},_=()=>{const e=g.default.join(b,".prettierrc");if(d.default.existsSync(e))try{return JSON.parse(d.default.readFileSync(e,O))||{}}catch(r){return r(r.message||".prettierrc\u8f6c\u6362\u9519\u8bef"),{}}return require("./.prettierrc")},E=()=>{const e=g.default.join(b,"project.config.json");if(!d.default.existsSync(e))return{};try{return JSON.parse(d.default.readFileSync(e,O))||{}}catch(r){return r(r.message||"project.config.json\u8f6c\u6362\u9519\u8bef"),{}}},I=()=>{const e=g.default.join(b,"package.json");if(!d.default.existsSync(e))return{};try{return JSON.parse(d.default.readFileSync(e,O))||{}}catch(r){return r(r.message||"package.json\u8f6c\u6362\u9519\u8bef"),{}}},$=e=>{const r=F();let t="";try{t=require.resolve(`@baic/${e}-config-yolk`)}catch(c){}const o=(0,m.globSync)(`*.${e}rc*`,{cwd:b,dot:!0}),n=o[0];return!1===r.strict&&n&&d.default.existsSync(n)?n:d.default.existsSync(t)?t:n},D=()=>$("eslint"),G=()=>$("stylelint"),L=()=>$("prettier");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baic/yolk-cli",
-  "version": "2.1.0-alpha.222",
+  "version": "2.1.0-alpha.224",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/303394539/yolk.git"
@@ -25,7 +25,7 @@
     "prebundle": "father prebundle"
   },
   "dependencies": {
-    "@baic/yolk-prebundle": "^2.1.0-alpha.222",
+    "@baic/yolk-prebundle": "^2.1.0-alpha.224",
     "@democrance/imagemin-lint-staged": "2.x",
     "@types/inquirer": "8.x",
     "@types/lint-staged": "~13.x",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2f69459607cedbb58d0ac2e6956eef08981d2a1c"
+  "gitHead": "9fc31021648f519d5914e658140426c74f5893c3"
 }