@cgzair/cgz-fabric 1.1.0 → 1.2.0

package/lib/cli.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-"use strict";var __awaiter=this&&this.__awaiter||function(e,a,c,s){return new(c=c||Promise)(function(r,t){function n(e){try{o(s.next(e))}catch(e){t(e)}}function i(e){try{o(s.throw(e))}catch(e){t(e)}}function o(e){var t;e.done?r(e.value):((t=e.value)instanceof c?t:new c(function(e){e(t)})).then(n,i)}o((s=s.apply(e,a||[])).next())})},__importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0});const path_1=__importDefault(require("path")),commander_1=require("commander"),cgz_core_1=require("cgz-core"),install_1=__importDefault(require("./scripts/install")),extension_1=__importDefault(require("./utils/extension")),cwd=process.cwd(),currentPkg=(0,cgz_core_1.getCurrentPkg)(path_1.default.resolve(__dirname,"../"));commander_1.program.version(currentPkg.version,"-v").description(currentPkg.name+" 是《信息技术部前端编码手册》的配套 CLI 工具，一键接入符合前端研发部门的编码规范，提高项目研发效率。"),commander_1.program.command("install").alias("i").description("交互式生成适用于当前项目的编码规范").option("--vsc","写入 .vscode 推荐配置").option("--ext","安装 vscode 推荐扩展").action(e=>__awaiter(void 0,void 0,void 0,function*(){e.ext?(0,extension_1.default)():yield(0,install_1.default)({cwd:cwd},e.vsc)})),commander_1.program.parse(process.argv);
+"use strict";var __awaiter=this&&this.__awaiter||function(e,a,c,s){return new(c=c||Promise)(function(r,t){function n(e){try{o(s.next(e))}catch(e){t(e)}}function i(e){try{o(s.throw(e))}catch(e){t(e)}}function o(e){var t;e.done?r(e.value):((t=e.value)instanceof c?t:new c(function(e){e(t)})).then(n,i)}o((s=s.apply(e,a||[])).next())})},__importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0});const path_1=__importDefault(require("path")),commander_1=require("commander"),cgz_core_1=require("@cgzair/cgz-core"),install_1=__importDefault(require("./scripts/install")),extension_1=__importDefault(require("./utils/extension")),cwd=process.cwd(),currentPkg=(0,cgz_core_1.getCurrentPkg)(path_1.default.resolve(__dirname,"../"));commander_1.program.version(currentPkg.version,"-v").description(currentPkg.name+" 是《信息技术部前端编码手册》的配套 CLI 工具，一键接入符合前端研发部门的编码规范，提高项目研发效率。"),commander_1.program.command("install").alias("i").description("交互式生成适用于当前项目的编码规范").option("--vsc","写入 .vscode 推荐配置").option("--ext","安装 vscode 推荐扩展").action(e=>__awaiter(void 0,void 0,void 0,function*(){e.ext?(0,extension_1.default)():yield(0,install_1.default)({cwd:cwd},e.vsc)})),commander_1.program.parse(process.argv);

package/lib/config/_commitlintrc.js.ejs

@@ -1,3 +1,3 @@
 module.exports = {
-  extends: ["cgz"],
+  extends: ["@cgzair/commitlint-config-cgz"],
 };

package/lib/config/_eslintrc.js.ejs

@@ -1,3 +1,3 @@
 module.exports = {
-  extends: ["<%= eslint === 'javascript' ? 'eslint-config-cgz' : `eslint-config-cgz/${eslint}` %>"<%_ if (prettier) { _%>, "prettier"<%_ } _%>],
+  extends: ["<%= eslint === 'javascript' ? '@cgzair/eslint-config-cgz' : `@cgzair/eslint-config-cgz/${eslint}` %>"<%_ if (prettier) { _%>, "prettier"<%_ } _%>],
 };

package/lib/config/_markdownlint.json.ejs

@@ -1,5 +1,5 @@
 <%_ if (markdownlint) { _%>
 {
-  "extends": "markdownlint-config-cgz"
+  "extends": "@cgzair/markdownlint-config-cgz"
 }
 <%_ } _%>

package/lib/config/_prettierrc.js.ejs

@@ -1,3 +1,3 @@
 module.exports = {
-  ...require("prettier-config-cgz"),
+  ...require("@cgzair/prettier-config-cgz"),
 };

package/lib/config/_stylelintrc.js.ejs

@@ -1,5 +1,5 @@
 <%_ if (stylelint) { _%>
 module.exports = {
-  extends: "stylelint-config-cgz",
+  extends: "@cgzair/stylelint-config-cgz",
 };
 <%_ } _%>

package/lib/scripts/install.js

@@ -1 +1 @@
-"use strict";var __awaiter=this&&this.__awaiter||function(e,s,l,a){return new(l=l||Promise)(function(i,t){function n(e){try{o(a.next(e))}catch(e){t(e)}}function r(e){try{o(a.throw(e))}catch(e){t(e)}}function o(e){var t;e.done?i(e.value):((t=e.value)instanceof l?t:new l(function(e){e(t)})).then(n,r)}o((a=a.apply(e,s||[])).next())})},__importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0});const path_1=__importDefault(require("path")),execa_1=__importDefault(require("execa")),inquirer_1=__importDefault(require("inquirer")),cgz_core_1=require("cgz-core"),extension_1=__importDefault(require("../utils/extension")),generate_template_1=__importDefault(require("../utils/generate-template")),constants_1=require("../constants");let step=0;const handleEslint=()=>__awaiter(void 0,void 0,void 0,function*(){var e=(yield inquirer_1.default.prompt({type:"list",name:"type",message:`第 ${++step} 步，请选择项目类型：`,choices:constants_1.PROJECT_CATEGORYS}))["type"];return e}),handleStylelint=t=>__awaiter(void 0,void 0,void 0,function*(){var e=(yield inquirer_1.default.prompt({type:"confirm",name:"enable",message:`第 ${++step} 步，是否启用 stylelint（若没有样式文件则不需要）：`,default:t}))["enable"];return e}),handleMarkdownLint=()=>__awaiter(void 0,void 0,void 0,function*(){var e=(yield inquirer_1.default.prompt({type:"confirm",name:"enable",message:`第 ${++step} 步，是否启用 markdownlint：`,default:!0}))["enable"];return e}),handlePrettier=()=>__awaiter(void 0,void 0,void 0,function*(){var e=(yield inquirer_1.default.prompt({type:"confirm",name:"enable",message:`第 ${++step} 步，是否启用 Prettier 格式化代码（推荐始终开启）：`,default:!0}))["enable"];return e});exports.default=(i,n)=>__awaiter(void 0,void 0,void 0,function*(){var e=i.cwd||process.cwd(),t={};process.chdir(e),i.eslint&&constants_1.PROJECT_CATEGORYS.some(e=>e.value===i.eslint)?t.eslint=i.eslint:t.eslint=yield handleEslint(),"boolean"==typeof i.stylelint?t.stylelint=i.stylelint:t.stylelint=yield handleStylelint(!/node/.test(t.eslint)),"boolean"==typeof i.markdownlint?t.markdownlint=i.markdownlint:t.markdownlint=yield handleMarkdownLint(),"boolean"==typeof i.prettier?t.prettier=i.prettier:t.prettier=yield handlePrettier(),cgz_core_1.log.info(`第 ${++step} 步，配置 git commit 卡点`);try{execa_1.default.sync("npx",["husky","install"],{cwd:e}),execa_1.default.sync("npx",["husky","set",".husky/commit-msg",'npx --no-install commitlint --edit "$1"'],{cwd:e}),execa_1.default.sync("npx",["husky","set",".husky/pre-commit","npx --no-install lint-staged"],{cwd:e}),(0,cgz_core_1.setScripts)("commit","git-cz",e),(0,cgz_core_1.setScripts)("postinstall","husky install",e),(0,cgz_core_1.setConfig)("config",{commitizen:{path:"@commitlint/cz-commitlint"}},e),(0,cgz_core_1.setConfig)("lint-staged",{"*.{js,jsx,tsx,ts,vue}":"eslint --cache --fix","*.{scss,less,css}":"stylelint --fix --allow-empty-input","*.md":"markdownlint --fix","*.{js,jsx,tsx,ts,vue,scss,less,css,json,html}":"prettier --write"},e),cgz_core_1.log.success("配置 git commit 卡点成功")}catch(e){cgz_core_1.log.error(e),cgz_core_1.log.error("配置 git commit 卡点失败")}cgz_core_1.log.info(`第 ${++step} 步，写入编码规范配置文件`),(0,generate_template_1.default)(e,t,n),cgz_core_1.log.success("写入编码规范配置文件成功"),cgz_core_1.log.info(`第 ${++step} 步，安装vscode 扩展`),(0,extension_1.default)(e),cgz_core_1.log.result("初始化完成",path_1.default.resolve(__dirname,"../../"),!0)});
+"use strict";var __awaiter=this&&this.__awaiter||function(e,s,l,a){return new(l=l||Promise)(function(i,t){function n(e){try{o(a.next(e))}catch(e){t(e)}}function r(e){try{o(a.throw(e))}catch(e){t(e)}}function o(e){var t;e.done?i(e.value):((t=e.value)instanceof l?t:new l(function(e){e(t)})).then(n,r)}o((a=a.apply(e,s||[])).next())})},__importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0});const path_1=__importDefault(require("path")),execa_1=__importDefault(require("execa")),inquirer_1=__importDefault(require("inquirer")),cgz_core_1=require("@cgzair/cgz-core"),extension_1=__importDefault(require("../utils/extension")),generate_template_1=__importDefault(require("../utils/generate-template")),constants_1=require("../constants");let step=0;const handleEslint=()=>__awaiter(void 0,void 0,void 0,function*(){var e=(yield inquirer_1.default.prompt({type:"list",name:"type",message:`第 ${++step} 步，请选择项目类型：`,choices:constants_1.PROJECT_CATEGORYS}))["type"];return e}),handleStylelint=t=>__awaiter(void 0,void 0,void 0,function*(){var e=(yield inquirer_1.default.prompt({type:"confirm",name:"enable",message:`第 ${++step} 步，是否启用 stylelint（若没有样式文件则不需要）：`,default:t}))["enable"];return e}),handleMarkdownLint=()=>__awaiter(void 0,void 0,void 0,function*(){var e=(yield inquirer_1.default.prompt({type:"confirm",name:"enable",message:`第 ${++step} 步，是否启用 markdownlint：`,default:!0}))["enable"];return e}),handlePrettier=()=>__awaiter(void 0,void 0,void 0,function*(){var e=(yield inquirer_1.default.prompt({type:"confirm",name:"enable",message:`第 ${++step} 步，是否启用 Prettier 格式化代码（推荐始终开启）：`,default:!0}))["enable"];return e});exports.default=(i,n)=>__awaiter(void 0,void 0,void 0,function*(){var e=i.cwd||process.cwd(),t={};process.chdir(e),i.eslint&&constants_1.PROJECT_CATEGORYS.some(e=>e.value===i.eslint)?t.eslint=i.eslint:t.eslint=yield handleEslint(),"boolean"==typeof i.stylelint?t.stylelint=i.stylelint:t.stylelint=yield handleStylelint(!/node/.test(t.eslint)),"boolean"==typeof i.markdownlint?t.markdownlint=i.markdownlint:t.markdownlint=yield handleMarkdownLint(),"boolean"==typeof i.prettier?t.prettier=i.prettier:t.prettier=yield handlePrettier(),cgz_core_1.log.info(`第 ${++step} 步，配置 git commit 卡点`);try{execa_1.default.sync("npx",["husky","install"],{cwd:e}),execa_1.default.sync("npx",["husky","set",".husky/commit-msg",'npx --no-install commitlint --edit "$1"'],{cwd:e}),execa_1.default.sync("npx",["husky","set",".husky/pre-commit","npx --no-install lint-staged"],{cwd:e}),(0,cgz_core_1.setScripts)("commit","git-cz",e),(0,cgz_core_1.setScripts)("postinstall","husky install",e),(0,cgz_core_1.setConfig)("config",{commitizen:{path:"@commitlint/cz-commitlint"}},e),(0,cgz_core_1.setConfig)("lint-staged",{"*.{js,jsx,tsx,ts,vue}":"eslint --cache --fix","*.{scss,less,css}":"stylelint --fix --allow-empty-input","*.md":"markdownlint --fix","*.{js,jsx,tsx,ts,vue,scss,less,css,json,html}":"prettier --write"},e),cgz_core_1.log.success("配置 git commit 卡点成功")}catch(e){cgz_core_1.log.error(e),cgz_core_1.log.error("配置 git commit 卡点失败")}cgz_core_1.log.info(`第 ${++step} 步，写入编码规范配置文件`),(0,generate_template_1.default)(e,t,n),cgz_core_1.log.success("写入编码规范配置文件成功"),cgz_core_1.log.info(`第 ${++step} 步，安装vscode 扩展`),(0,extension_1.default)(e),cgz_core_1.log.result("初始化完成",path_1.default.resolve(__dirname,"../../"),!0)});

package/lib/utils/extension.js

@@ -1 +1 @@
-"use strict";var __importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0});const fs_1=__importDefault(require("fs")),child_process_1=require("child_process"),path_1=__importDefault(require("path")),cgz_core_1=require("cgz-core");exports.default=(e=path_1.default.resolve(__dirname,"../../../"))=>{try{(0,child_process_1.execSync)("code -v")}catch(e){return cgz_core_1.log.info("当前系统暂未安装 vscode，扩展安装已跳过，更多请参考：https://code.visualstudio.com/")}JSON.parse(fs_1.default.readFileSync(path_1.default.resolve(__dirname,"../config/_vscode/extensions.json.ejs"),"utf-8")).recommendations.forEach(e=>{cgz_core_1.log.info(`安装 ${e} ...`),(0,child_process_1.execSync)("code --install-extension "+e),cgz_core_1.log.info(e+" 安装成功")}),(0,cgz_core_1.setScripts)("extension","fabric i --ext",e),cgz_core_1.log.info("写入 vscode 扩展 scripts 配置成功"),cgz_core_1.log.success("安装推荐 vscode 扩展成功")};
+"use strict";var __importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0});const fs_1=__importDefault(require("fs")),child_process_1=require("child_process"),path_1=__importDefault(require("path")),cgz_core_1=require("@cgzair/cgz-core");exports.default=(e=path_1.default.resolve(__dirname,"../../../"))=>{try{(0,child_process_1.execSync)("code -v")}catch(e){return cgz_core_1.log.info("当前系统暂未安装 vscode，扩展安装已跳过，更多请参考：https://code.visualstudio.com/")}JSON.parse(fs_1.default.readFileSync(path_1.default.resolve(__dirname,"../config/_vscode/extensions.json.ejs"),"utf-8")).recommendations.forEach(e=>{cgz_core_1.log.info(`安装 ${e} ...`),(0,child_process_1.execSync)("code --install-extension "+e),cgz_core_1.log.info(e+" 安装成功")}),(0,cgz_core_1.setScripts)("extension","fabric i --ext",e),cgz_core_1.log.info("写入 vscode 扩展 scripts 配置成功"),cgz_core_1.log.success("安装推荐 vscode 扩展成功")};

package/lib/utils/generate-template.js

@@ -1 +1 @@
-"use strict";var __importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0});const path_1=__importDefault(require("path")),fs_1=__importDefault(require("fs")),cgz_core_1=require("cgz-core"),lodash_1=__importDefault(require("lodash")),glob_1=__importDefault(require("glob")),ejs_1=__importDefault(require("ejs")),constants_1=require("../constants"),mergeVSCodeConfig=(e,t)=>{if(!(0,cgz_core_1.isAccessSync)(e))return t;try{var r=JSON.parse(fs_1.default.readFileSync(e,"utf8")),s=JSON.parse(t);return JSON.stringify(lodash_1.default.mergeWith(r,s,(e,t)=>{if(Array.isArray(e)&&Array.isArray(t))return lodash_1.default.union(t.concat(e))}),null,2)}catch(e){return""}};exports.default=(t,r,e,s=path_1.default.resolve(__dirname,"../config"))=>{e=glob_1.default.sync(`${e?"_vscode":"**"}/*.ejs`,{cwd:s});(0,cgz_core_1.isAccessSync)(path_1.default.resolve(t,".vscode"))||fs_1.default.mkdirSync(path_1.default.resolve(t,".vscode"));for(const a of e){var _=path_1.default.resolve(t,a.replace(/\.ejs$/,"").replace(/^_/,"."));let e=ejs_1.default.render(fs_1.default.readFileSync(path_1.default.resolve(s,a),"utf8"),Object.assign({stylelintExt:constants_1.STYLELINT_FILE_EXT,stylelintIgnores:constants_1.STYLELINT_IGNORE_PATTERN,markdownLintIgnores:constants_1.MARKDOWN_LINT_IGNORE_PATTERN},r));(e=/^_vscode/.test(a)?mergeVSCodeConfig(_,e):e).trim()&&fs_1.default.writeFileSync(_,e,"utf8")}};
+"use strict";var __importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0});const path_1=__importDefault(require("path")),fs_1=__importDefault(require("fs")),cgz_core_1=require("@cgzair/cgz-core"),lodash_1=__importDefault(require("lodash")),glob_1=__importDefault(require("glob")),ejs_1=__importDefault(require("ejs")),constants_1=require("../constants"),mergeVSCodeConfig=(e,t)=>{if(!(0,cgz_core_1.isAccessSync)(e))return t;try{var r=JSON.parse(fs_1.default.readFileSync(e,"utf8")),s=JSON.parse(t);return JSON.stringify(lodash_1.default.mergeWith(r,s,(e,t)=>{if(Array.isArray(e)&&Array.isArray(t))return lodash_1.default.union(t.concat(e))}),null,2)}catch(e){return""}};exports.default=(t,r,e,s=path_1.default.resolve(__dirname,"../config"))=>{e=glob_1.default.sync(`${e?"_vscode":"**"}/*.ejs`,{cwd:s});(0,cgz_core_1.isAccessSync)(path_1.default.resolve(t,".vscode"))||fs_1.default.mkdirSync(path_1.default.resolve(t,".vscode"));for(const _ of e){var a=path_1.default.resolve(t,_.replace(/\.ejs$/,"").replace(/^_/,"."));let e=ejs_1.default.render(fs_1.default.readFileSync(path_1.default.resolve(s,_),"utf8"),Object.assign({stylelintExt:constants_1.STYLELINT_FILE_EXT,stylelintIgnores:constants_1.STYLELINT_IGNORE_PATTERN,markdownLintIgnores:constants_1.MARKDOWN_LINT_IGNORE_PATTERN},r));(e=/^_vscode/.test(_)?mergeVSCodeConfig(a,e):e).trim()&&fs_1.default.writeFileSync(a,e,"utf8")}};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgzair/cgz-fabric",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A collection of configuration files containing prettier, eslint, stylelint, markdown",
   "main": "lib/index.js",
   "bin": {
@@ -31,7 +31,7 @@
     "@babel/preset-env": "^7.16.10",
     "@babel/preset-react": "^7.16.7",
     "@babel/preset-typescript": "^7.16.7",
-    "@cgzair/cgz-core": "^0.3.7",
+    "@cgzair/cgz-core": "^1.0.0",
     "@cgzair/commitlint-config-cgz": "^1.1.0",
     "@cgzair/eslint-config-cgz": "^1.1.0",
     "@cgzair/markdownlint-config-cgz": "^1.1.0",
@@ -75,5 +75,5 @@
     "node": ">=12.0.0"
   },
   "license": "MIT",
-  "gitHead": "ac4f859f68745c4250c8aab06047ce03b0de733e"
+  "gitHead": "c3421e15089196c5f1fac72e25562987744536ee"
 }