@baic/yolk-cli 2.0.1-alpha.1 → 2.0.1-alpha.12

package/{templates/web/base/LICENSE → LICENSE}

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Baic
+Copyright (c) 2022 Baic
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -26,7 +26,7 @@ $ yolk build
 
 ## .yolkrc
 
-##### yolk内置配置文件
+##### yolk 内置配置文件
 
 ```json
 {
@@ -36,8 +36,8 @@ $ yolk build
 
 #### API
 
-|   参数   |     说明     |  类型  | 默认值 |
-| :------: | :----------: | :----: | :----: |
-|  eslintIgnore  |  忽略commit时eslint代码检查，符合glob语法  | string \| RegExp \| array |   -    |
-|  stylelintIgnore  |  忽略commit时stylelint代码检查，符合glob语法  | string \| RegExp \| array |   -    |
-|  strict  |  严格模式，关闭以后使用项目定义的eslint规则进行提交检查  | boolean |   -    |
+|      参数       |                           说明                           |           类型            | 默认值 |
+| :-------------: | :------------------------------------------------------: | :-----------------------: | :----: |
+|  eslintIgnore   |      忽略 commit 时 eslint 代码检查，符合 glob 语法      | string \| RegExp \| array |   -    |
+| stylelintIgnore |    忽略 commit 时 stylelint 代码检查，符合 glob 语法     | string \| RegExp \| array |   -    |
+|     strict      | 严格模式，关闭以后使用项目定义的 eslint 规则进行提交检查 |          boolean          |   -    |

package/lib/index.js

@@ -0,0 +1,2 @@
+#! /usr/bin/env node
+"use strict";var e=require("@babel/runtime/helpers/interopRequireDefault"),t=require("@babel/runtime/helpers/typeof"),n=e(require("@babel/runtime/helpers/toArray")),r=e(require("@babel/runtime/helpers/toConsumableArray")),a=e(require("@babel/runtime/helpers/defineProperty")),i=e(require("lodash/isString")),o=e(require("lodash/pick")),c=e(require("lodash/chunk")),s=e(require("fs")),u=e(require("path")),l=e(require("os")),f=e(require("commander")),d=e(require("inquirer")),p=require("child_process"),m=e(require("ora")),y=e(require("glob")),g=e(require("minimatch")),v=e(require("mustache")),h=e(require("mkdirp")),b=e(require("rimraf")),j=require("prettier"),S=x(require("miniprogram-ci")),k=e(require("../package.json"));function w(e){if("function"!==typeof WeakMap)return null;var t=new WeakMap,n=new WeakMap;return(w=function(e){return e?n:t})(e)}function x(e,n){if(!n&&e&&e.__esModule)return e;if(null===e||"object"!==t(e)&&"function"!==typeof e)return{default:e};var r=w(n);if(r&&r.has(e))return r.get(e);var a={},i=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var o in e)if("default"!==o&&Object.prototype.hasOwnProperty.call(e,o)){var c=i?Object.getOwnPropertyDescriptor(e,o):null;c&&(c.get||c.set)?Object.defineProperty(a,o,c):a[o]=e[o]}return a["default"]=e,r&&r.set(e,a),a}function O(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function P(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?O(Object(n),!0).forEach((function(t){(0,a["default"])(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):O(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}var q=require("staged-git-files"),F=process.cwd(),E="##### CREATED BY YOLK #####",D={ts:"typescript",tsx:"typescript",less:"less",sass:"scss",scss:"scss",css:"css"},B="utf-8",I=60,R=["**/node_modules/**","**/.umi/**","**/.umi-production/**","**/build/**","**/dist/**","**/lib/**","**/public/**","**/assets/**","**/h5+app/**","**/mock/**","**/yolk/**","**/yolk-web/**","**/yolk-web-ui/**","**/yolk-mobile/**","**/yolk-mobile-ui/**","**/yolk-miniprogram/**","**/yolk-miniprogram-ui/**"],Q=(0,m["default"])(),T=function(e){return e&&Q.warn(Buffer.from(e,B).toString())},_=function(e){return e&&Q.fail(Buffer.from(e,B).toString())},L=function(e){return e&&Q.succeed(Buffer.from(e,B).toString())},N=function(e){return e&&Q.info(Buffer.from(e,B).toString())},A=function(e){return"win32"===process.platform?"".concat(e,".cmd"):e},M=function(){L("yolk complete!"),process.exit(0)},K=function(){T("yolk break!"),process.exit(0)},C=function(e){var t=e.command,n=e.args,r=e.complete,a=e.close,i=e.exit,o=void 0===i||i,c=(0,p.spawn)(A(t),n||[],{stdio:"inherit"}).on("close",(function(e){e?(a&&a(),_("yolk close!"),process.exit(e)):(r&&r(),o&&M())}));process.on("SIGINT",(function(){f["default"].runningCommand&&f["default"].runningCommand.kill("SIGKILL"),c.kill(),K()}))},$=function(e,t,n){d["default"].prompt([{type:"list",name:"type",message:"\u9009\u62e9\u5e73\u53f0",default:"web",choices:[{name:"web",value:"web"},{name:"mobile",value:"mobile"},{name:"\u5c0f\u7a0b\u5e8f",value:"miniprogram"}]},{type:"input",name:"projectName",message:"\u9879\u76ee\u540d\u79f0",default:u["default"].basename(u["default"].basename(process.cwd()))},{type:"list",name:"dependenciesInstallType",message:"\u9009\u62e9\u4f9d\u8d56\u5b89\u88c5\u65b9\u5f0f",default:!1,choices:[{name:"yarn install",value:"yarn"},{name:"npm install",value:"npm"},{name:"\u4e0d\u521d\u59cb\u5316",value:!1}]}]).then((function(r){var a={projectName:r.projectName,mobile:"mobile"===r.type,dependenciesInstallType:r.dependenciesInstallType};t||(t=u["default"].join(__dirname,"../templates/".concat(r.type))),L("\u590d\u5236\u6a21\u7248 ".concat(u["default"].basename(t)));var i=y["default"].sync("**/*",{cwd:t,dot:!0,ignore:["**/node_modules/**","**/.git/**","**/.DS_Store","**/.idea/**"]});if(i.forEach((function(n){if(t){var r=u["default"].join(t,n);if(!s["default"].statSync(r).isDirectory())if(n.endsWith(".tpl")){var i=s["default"].readFileSync(r,B),o=u["default"].join(e,n.replace(/\.tpl$/,"")),c=v["default"].render(i,a);h["default"].sync(u["default"].dirname(o)),L("\u521b\u5efa ".concat(u["default"].relative(e,o))),s["default"].writeFileSync(o,c,B)}else{L("\u521b\u5efa ".concat(n));var l=u["default"].join(e,n);h["default"].sync(u["default"].dirname(l)),s["default"].copyFileSync(r,l)}}})),L("\u590d\u5236\u6a21\u7248 success!"),n&&s["default"].existsSync(t)&&(0,b["default"])(t,(function(){L("\u7f13\u5b58\u5220\u9664 success! ".concat(u["default"].basename(t||"")))})),r.dependenciesInstallType)switch(L("\u521d\u59cb\u5316\u4f9d\u8d56\u5305"),r.dependenciesInstallType){case"npm":C({command:"npm",args:["install"]});break;case"yarn":default:C({command:"yarn",args:["install"]});break}L("\u53ef\u67e5\u9605<<https://303394539.github.io/yolk-docs/>>\u4e86\u89e3\u76f8\u5173\u6587\u6863")}))},J=function(e,t){return $(e,t,!0)},U=function(){var e=y["default"].sync("*.yolkrc*",{cwd:F,dot:!0});if(!e.length)return{};var t=u["default"].join(F,e[0]);if(!s["default"].existsSync(t))return{};try{return JSON.parse(s["default"].readFileSync(t,B))||{}}catch(n){return _(n.message||".yolkrc\u8f6c\u6362\u9519\u8bef"),{}}},W=function(){var e=u["default"].join(F,".prettierrc");if(!s["default"].existsSync(e)){if(s["default"].existsSync(require.resolve("@umijs/fabric/dist/prettier"))){var t=require("@umijs/fabric/dist/prettier");return t}return{}}try{return JSON.parse(s["default"].readFileSync(e,B))||{}}catch(n){return _(n.message||".prettierrc\u8f6c\u6362\u9519\u8bef"),{}}},G=function(){var e=u["default"].join(F,"project.config.json");if(!s["default"].existsSync(e))return{};try{return JSON.parse(s["default"].readFileSync(e,B))||{}}catch(t){return _(t.message||"project.config.json\u8f6c\u6362\u9519\u8bef"),{}}},H=function(){var e=u["default"].join(F,"package.json");if(!s["default"].existsSync(e))return{};try{return JSON.parse(s["default"].readFileSync(e,B))||{}}catch(t){return _(t.message||"package.json\u8f6c\u6362\u9519\u8bef"),{}}},V=function(){return s["default"].existsSync(u["default"].join(F,"project.config.json"))},Y=function(){var e=u["default"].join(F,"project.config.json");if(s["default"].existsSync(e)){var t=require(e);return t.appid}return""},z=function(){return s["default"].existsSync(u["default"].join(F,"project.tt.json"))&&0===Y().indexOf("tt")},X=function(){return 0===Y().indexOf("20")},Z=function(){var e=U(),t=V()?require.resolve("@baic/eslint-config-yolk-miniprogram"):require.resolve("@baic/eslint-config-yolk"),n=y["default"].sync("*.eslintrc*",{cwd:F,dot:!0}),r=n[0];return!1===e.strict&&r&&s["default"].existsSync(r)?r:t},ee=function(){var e=y["default"].sync("*.stylelintrc*",{cwd:F,dot:!0}),t=e[0];return t},te=function(){var e=u["default"].join(F,".git/"),t=u["default"].join(F,".git/hooks"),n=u["default"].join(t,"pre-commit"),r=s["default"].existsSync(e),a=s["default"].existsSync(n),i=a&&s["default"].readFileSync(n,"utf8").includes(E);if(r&&(!a||!i)){h["default"].sync(t),s["default"].writeFileSync(n,["#!/usr/bin/env bash","npx yolk pre-commit","RESULT=$?","[ $RESULT -ne 0 ] && exit 1","exit 0",E].join(l["default"].EOL),"utf8");try{s["default"].chmodSync(n,"777")}catch(o){_("chmod ".concat(n," failed: ").concat(o.message))}L("Create pre-commit hook")}},ne=function(){var e=U(),t=!1!==e.strict,n=e.eslintIgnore,a=e.stylelintIgnore;q().then((function(e){var i=new Promise((function(n,i){var o=ee();if(o){var l=e.map((function(e){return e.filename})).filter((function(e){return/^([s\u017F]rc|te[s\u017F]t[s\u017F])/i.test(e)})).filter((function(e){return/\.(le|[s\u017F]a|[s\u017F]c|c)[s\u017F]{2}$/i.test(e)})).filter((function(e){return R.every((function(t){return!(0,g["default"])(e,t,{matchBase:!0})}))})).filter((function(e){return"string"===typeof a?!(0,g["default"])(e,a,{matchBase:!0}):a instanceof RegExp?!a.test(e):!Array.isArray(a)||a.every((function(t){return"string"===typeof t?!(0,g["default"])(e,t,{matchBase:!0}):!(t instanceof RegExp)||!t.test(e)}))})).map((function(e){var t=u["default"].join(F,e);return s["default"].existsSync(t)?t:null})).filter((function(e){return!!e}));if(l.forEach((function(e){if(e&&s["default"].existsSync(e)){var t=u["default"].extname(e).replace(/^\./,""),n=s["default"].readFileSync(e,"utf8"),r=(0,j.format)(n,P({parser:D[t]},W()));s["default"].writeFileSync(e,r,"utf8")}})),L("style prettier success!"),l.length>=I){var f=[];(0,c["default"])(l,20).forEach((function(e){f.push(new Promise((function(n,a){C({command:"stylelint",args:[t?"--ignore-disables":"","--allow-empty-input","--config",o].concat((0,r["default"])(e)),complete:n,close:a,exit:!1})})))}));var d=process.getMaxListeners(),p=(0,c["default"])(f,d?d/2:2),m=0,y=function e(){m<p.length?Promise.all(p[m]).then((function(){m++,e()}))["catch"](i):n()};y()}else l.length&&C({command:"stylelint",args:[t?"--ignore-disables":"","--allow-empty-input","--config",o].concat((0,r["default"])(l)),complete:n,close:i,exit:!1})}else n()})),o=function(){var a=e.map((function(e){return e.filename})).filter((function(e){return/^([s\u017F]rc|te[s\u017F]t[s\u017F])/i.test(e)})).filter((function(e){return/\.([jt\|][s\u017F]x?)$/i.test(e)})).map((function(e){var t=u["default"].join(F,e);return s["default"].existsSync(t)?t:null})).filter((function(e){return!!e}));if(a.length){a.forEach((function(e){if(e&&s["default"].existsSync(e)){var t=u["default"].extname(e).replace(/^\./,""),n=s["default"].readFileSync(e,"utf8"),r=(0,j.format)(n,P({parser:D[t]},W()));s["default"].writeFileSync(e,r,"utf8")}})),L("script prettier success!");var i=Z();if(i){var o=a.filter((function(e){return R.every((function(t){return!(0,g["default"])(e,t,{matchBase:!0})}))})).filter((function(e){return"string"===typeof n?!(0,g["default"])(e,n,{matchBase:!0}):n instanceof RegExp?!n.test(e):!Array.isArray(n)||n.every((function(t){return"string"===typeof t?!(0,g["default"])(e,t,{matchBase:!0}):!(t instanceof RegExp)||!t.test(e)}))}));if(t&&(T("git commit\u7981\u6b62eslint\u7684ignore\u65b9\u5f0f(eslint-disable\u3001.eslintrc*\u3001ignore\u7b49)\u3002"),n&&T("\u901a\u8fc7yolkrc\u914d\u7f6eeslintIgnore\uff1a".concat(n,"\u3002"))),o.length>=I){var l=[];(0,c["default"])(o,20).forEach((function(e){l.push(new Promise((function(n){C({command:"eslint",args:[t?"--no-inline-config --no-ignore":"","--no-error-on-unmatched-pattern","--config",i].concat((0,r["default"])(e)),complete:n,exit:!1})})))}));var f=process.getMaxListeners(),d=(0,c["default"])(l,f?f/2:2),p=0,m=function e(){p<d.length?Promise.all(d[p]).then((function(){p++,e()})):M()};m()}else o.length&&C({command:"eslint",args:[t?"--no-inline-config --no-ignore":"","--no-error-on-unmatched-pattern","--config",i].concat((0,r["default"])(o))})}else T("\u6ca1\u6709eslint\u914d\u7f6e\u6587\u4ef6")}else M()};T("\u8981\u6c42\u7edf\u4e00\u4ee3\u7801\u89c4\u8303\uff0c\u8fdb\u884c\u4e25\u683c\u7684\u8bed\u6cd5\u68c0\u67e5\u3002"),i.then(o)}))},re=function(e){var t=e.mProject,n=e.mPrivateKeyPath,r=e.mVersion,a=e.mDesc,i=e.mRobot,o=e.mQrcodeFormat,c=e.mQrcodeOutputDest,l=e.mPagePath,f=e.mSearchQuery,d=s["default"].existsSync(u["default"].join(F,".git"))?(0,p.execSync)("git log -1 --pretty=format:%H").toString():"",m=G(),y=m.appid,g=t||u["default"].join(F,"dist"),v=n||u["default"].join(F,"private.".concat(y,".key"));if(s["default"].existsSync(g)){if(s["default"].existsSync(v)){var h=H(),b=r||h.version||m.version||"1.0.0",j=a||h.description||m.description,k="version: ".concat(b,";").concat(d?" commit: ".concat(d,";"):"").concat(j?" description: ".concat(j,";"):"");d&&N("commit: ".concat(d)),N("dist: ".concat(g)),N("key: ".concat(v)),N("appid: ".concat(y)),N("version: ".concat(b)),N("desc: ".concat(k));var w=new S.Project({appid:y,type:"miniProgram",projectPath:g,privateKeyPath:v,ignores:["node_modules/**/*","**/*.txt","**/*.key","**/*.less","**/*.sass","**/*.scss","**/*.css","**/*.jsx","**/*.ts","**/*.tsx","**/*.md"]});return{appid:y,options:{project:w,version:b,desc:k,setting:m.setting,robot:i,qrcodeFormat:o,qrcodeOutputDest:c,pagePath:l,searchQuery:f}}}throw Error("\u6ca1\u6709\u627e\u5230\u4e0a\u4f20\u5bc6\u94a5(".concat(v,")"))}throw Error("\u6ca1\u6709\u627e\u5230dist\u76ee\u5f55(".concat(g,")"))},ae=function(){N("yolk version: ".concat(k["default"].version)),N("node version: ".concat(process.version)),N("\u64cd\u4f5c\u7cfb\u7edf\u5e73\u53f0: ".concat(l["default"].platform())),N("\u64cd\u4f5c\u7cfb\u7edf: ".concat(l["default"].release())),N("\u7cfb\u7edf\u5185\u5b58\u603b\u91cf: ".concat(l["default"].totalmem()/1024/1024,"MB")),N("\u64cd\u4f5c\u7cfb\u7edf\u540d\u79f0: ".concat(l["default"].type())),N("\u5185\u6838\u7248\u672c: ".concat(l["default"].version())),te(),process.argv.length>2?f["default"].version(k["default"].version).usage("[command] [options]").option("--clone","\u901a\u8fc7git clone\u62c9\u53d6\u6a21\u7248").option("--template <template>","\u6a21\u7248\u540d\u79f0\u6216\u8005clone\u6a21\u5f0f\u7684git\u5730\u5740").option("--docs","\u542f\u52a8\u6587\u6863\u6a21\u5f0f").option("--mProject <project>","\u5c0f\u7a0b\u5e8f\u4e0a\u4f20\u5de5\u7a0b\u76ee\u5f55").option("--mPrivateKeyPath <privateKeyPath>","\u5c0f\u7a0b\u5e8f\u4e0a\u4f20key\u6587\u4ef6").option("--mVersion <version>","\u5c0f\u7a0b\u5e8f\u4e0a\u4f20\u7248\u672c\u53f7").option("--mDesc <desc>","\u5c0f\u7a0b\u5e8f\u4e0a\u4f20\u63cf\u8ff0").option("--mRobot <robot>","\u5c0f\u7a0b\u5e8f\u4e0a\u4f20ci\u673a\u5668\u4eba1~30").option("--mQrcodeFormat <qrcodeFormat>",'\u5c0f\u7a0b\u5e8f\u9884\u89c8\u8fd4\u56de\u4e8c\u7ef4\u7801\u6587\u4ef6\u7684\u683c\u5f0f "image" \u6216 "base64"\uff0c \u9ed8\u8ba4\u503c "terminal" \u4f9b\u8c03\u8bd5\u7528').option("--mQrcodeOutputDest <qrcodeOutputDest>","\u5c0f\u7a0b\u5e8f\u9884\u89c8\u4e8c\u7ef4\u7801\u6587\u4ef6\u4fdd\u5b58\u8def\u5f84").option("--mPagePath <pagePath>","\u5c0f\u7a0b\u5e8f\u9884\u89c8\u9884\u89c8\u9875\u9762\u8def\u5f84").option("--mSearchQuery <searchQuery>","\u5c0f\u7a0b\u5e8f\u9884\u89c8\u9884\u89c8\u9875\u9762\u8def\u5f84\u542f\u52a8\u53c2\u6570").action((function(e,t){var r=(0,n["default"])(t),a=r[0],c=r.slice(1),l=e.clone,f=e.template,d=e.docs;if(a)switch(a){case"init":if(L("yolk ".concat(a," \u5f00\u59cb")),l)if(f){var p=".yolk",m=u["default"].join(F,p);s["default"].existsSync(m)&&(0,b["default"])(m,(function(){L("\u7f13\u5b58\u5220\u9664 success! ".concat(m))})),C({command:"git",args:["clone","-b","master","--depth","1",f,p].concat(c)}),J(F,m)}else _("--clone \u6a21\u5f0f\u5fc5\u987b\u6709--template");else $(F);break;case"start":V()?z()?C({command:"taro",args:["build","--type","tt","--watch"].concat(c)}):X()?C({command:"taro",args:["build","--type","alipay","--watch"].concat(c)}):C({command:"taro",args:["build","--type","weapp","--watch"].concat(c)}):C(d?{command:"dumi",args:["dev"].concat(c)}:{command:"umi",args:["dev"].concat(c)});break;case"build":V()?z()?C({command:"taro",args:["build","--type","tt"].concat(c)}):X()?C({command:"taro",args:["build","--type","alipay"].concat(c)}):C({command:"taro",args:["build","--type","weapp"].concat(c)}):C(d?{command:"dumi",args:["build"].concat(c)}:{command:"umi",args:["build"].concat(c)});break;case"pre-commit":ne();break;case"test":C({command:"umi-test",args:["--no-cache","--update-snapshot","--runInBand","--detectOpenHandles"].concat(c)});break;case"miniapp-upload":case"miniprogram-upload":if(V())if(z());else if(X());else{var y=re(e),g=y.appid,v=y.options;N("".concat(g,"\u4e0a\u4f20\u5f00\u59cb")),S.upload(P(P({},(0,o["default"])(v,["project","version","desc","setting","robot"])),{},{onProgressUpdate:function(e){if((0,i["default"])(e))N("task: ".concat(e));else{var t=e.status,n=e.message;N("task(".concat(t,"): ").concat(n))}}})).then((function(){L("".concat(g,"\u4e0a\u4f20\u5b8c\u6210"))}))}break;case"miniapp-preview":case"miniprogram-preview":if(V())if(z());else if(X());else{var h=re(e),j=h.appid,k=h.options;N("".concat(j,"\u4e0a\u4f20\u9884\u89c8\u5f00\u59cb")),S.preview(P(P({},(0,o["default"])(k,["project","version","desc","setting","robot","qrcodeFormat","qrcodeOutputDest","pagePath","searchQuery"])),{},{onProgressUpdate:function(e){if((0,i["default"])(e))N("task: ".concat(e));else{var t=e.status,n=e.message;N("task(".concat(t,"): ").concat(n))}}})).then((function(){L("".concat(j,"\u4e0a\u4f20\u9884\u89c8\u5b8c\u6210"))}))}break;default:K()}})).parse(process.argv):K()};ae();

package/package.json

@@ -1,41 +1,45 @@
 {
   "name": "@baic/yolk-cli",
-  "version": "2.0.1-alpha.1",
-  "description": "",
-  "scripts": {
-    "pub": "npm publish",
-    "start": "node ./bin start"
-  },
+  "version": "2.0.1-alpha.12",
+  "author": "Baic <303394539@qq.com>",
+  "license": "MIT",
   "bin": {
-    "yolk": "bin/index.js"
+    "yolk": "lib/index.js"
   },
+  "main": "lib/index.js",
   "files": [
-    "bin",
+    "lib",
     "templates"
   ],
-  "author": "Baic",
   "repository": {
     "type": "git",
-    "url": "https://github.com/303394539/yolk"
+    "url": "git+https://github.com/303394539/yolk.git"
+  },
+  "scripts": {
+    "test": "echo \"Error: run tests from root\" && exit 1"
   },
-  "license": "MIT",
   "dependencies": {
+    "@babel/runtime": "~7.17.9",
     "@types/glob": "~7.2.0",
-    "@types/inquirer": "~8.1.3",
-    "@types/lodash": "~4.14.178",
+    "@types/inquirer": "~8.2.1",
+    "@types/lodash": "4.x",
     "@types/mkdirp": "~1.0.2",
     "@types/mustache": "~4.1.2",
+    "@types/prettier": "~2.6.0",
     "@types/rimraf": "~3.0.2",
     "commander": "6.x",
-    "glob": "~7.2.0",
-    "inquirer": "~8.2.0",
-    "lodash": "~4.17.21",
-    "miniprogram-ci": "~1.6.10",
+    "glob": "~8.0.1",
+    "inquirer": "~8.2.2",
+    "lodash": "4.x",
+    "miniprogram-ci": "~1.8.18",
     "mkdirp": "~1.0.4",
     "mustache": "~4.2.0",
-    "ora": "5.x",
-    "prettier": "~2.5.1",
+    "prettier": "~2.6.2",
     "rimraf": "~3.0.2",
-    "staged-git-files": "~1.2.0"
-  }
+    "staged-git-files": "~1.3.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "gitHead": "d0334097db0859afbf6e19f9cb05ee6e1aac5668"
 }

package/templates/miniprogram/.eslintrc

@@ -0,0 +1,6 @@
+{
+  "extends": "@baic/eslint-config-yolk-miniprogram",
+  "parserOptions": {
+    "project": "./tsconfig.json"
+  }
+}

package/templates/{miniapp/base → miniprogram}/.stylelintrc.json

@@ -1,3 +1,3 @@
 {
   "extends": "@baic/stylelint-config-yolk"
-}
+}

package/templates/{mobile/base → miniprogram}/README.md.tpl

@@ -5,14 +5,18 @@
 Install dependencies,
 
 {{ #dependenciesInstallType }}
+
 ```bash
 $ {{ dependenciesInstallType }} install
 ```
+
 {{ /dependenciesInstallType }}
 {{ ^dependenciesInstallType }}
+
 ```bash
 $ yarn install
 ```
+
 {{ /dependenciesInstallType }}
 
 Start the dev server,
@@ -27,4 +31,4 @@ Build,
 $ npm run build
 ```
 
-[查阅文档](https://303394539.github.io/yolk-docs/)
+[查阅文档](https://303394539.github.io/yolk-docs/)

package/templates/miniprogram/babel.config.js

@@ -0,0 +1,3 @@
+const config = require('@baic/yolk-taro/lib/babel.config');
+
+module.exports = config;

package/templates/miniprogram/config/index.ts.tpl

@@ -0,0 +1,11 @@
+import path from 'path';
+import config from '@baic/yolk-taro/lib/config';
+
+export default (merge) =>
+  merge(
+    {},
+    config(merge, {
+      projectName: '{{ projectName }}',
+      sassVarsResources: [path.resolve('src/theme.scss')],
+    }),
+  );

package/templates/miniprogram/global.d.ts

@@ -0,0 +1,33 @@
+declare module '*.png';
+declare module '*.gif';
+declare module '*.jpg';
+declare module '*.jpeg';
+declare module '*.svg' {
+  export function ReactComponent(
+    props: React.SVGProps<SVGSVGElement>,
+  ): React.ReactElement;
+  const url: string;
+  export default url;
+}
+declare module '*.css';
+declare module '*.less';
+declare module '*.scss';
+declare module '*.sass';
+declare module '*.styl';
+
+// @ts-ignore
+declare const process: NodeJS.Process & {
+  env: {
+    TARO_ENV:
+      | 'weapp'
+      | 'swan'
+      | 'alipay'
+      | 'h5'
+      | 'rn'
+      | 'tt'
+      | 'quickapp'
+      | 'qq'
+      | 'jd';
+    [key: string]: any;
+  };
+};

package/templates/{miniapp/base → miniprogram}/package.json.tpl

@@ -16,8 +16,7 @@
     "ios >= 8"
   ],
   "dependencies": {
-    "@baic/preset-yolk-miniapp": "1.x",
-    "babel-preset-taro": "3.x",
-    "eslint": "8.x"
+    "@baic/preset-yolk-miniapp": "~2.0.1-alpha.10",
+    "babel-preset-taro": "3.x"
   }
 }

package/templates/{miniapp/base → miniprogram}/project.config.json.tpl

@@ -1,7 +1,7 @@
 {
   "miniprogramRoot": "dist/",
   "projectname": "{{ projectName }}",
-  "description": "",
+  "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "appid": "touristappid",
   "setting": {
     "urlCheck": true,
@@ -36,11 +36,26 @@
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
-    "minifyWXSS": true
+    "minifyWXSS": true,
+    "lazyloadPlaceholderEnable": false,
+    "useStaticServer": true,
+    "showES6CompileOption": false,
+    "disableUseStrict": false,
+    "useCompilerPlugins": false,
+    "minifyWXML": true
   },
   "compileType": "miniprogram",
   "simulatorType": "wechat",
   "simulatorPluginLibVersion": {},
   "libVersion": "2.13.0",
-  "condition": {}
+  "condition": {},
+  "srcMiniprogramRoot": "dist/",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  }
 }

package/templates/{miniapp/base → miniprogram}/src/app.config.ts

@@ -1,9 +1,7 @@
 import { AppConfig } from '@tarojs/taro/types/index';
 
 export default {
-  pages: [
-    'pages/demo/index',
-  ],
+  pages: ['pages/index/index', 'pages/demo/index'],
   window: {
     backgroundTextStyle: 'light',
     navigationBarBackgroundColor: '#fff',

package/templates/miniprogram/src/app.tsx

@@ -0,0 +1,19 @@
+import * as React from 'react';
+
+import { Provider } from '@baic/yolk-taro-base';
+
+import { Provider as UIProvider } from '@baic/yolk-miniprogram';
+
+import request from '@/common/request';
+
+import './app.scss';
+
+interface Props {
+  children: React.ReactNode;
+}
+
+export default ({ children }: Props) => (
+  <Provider request={request}>
+    <UIProvider inputMaxLength={40}>{children}</UIProvider>
+  </Provider>
+);

package/templates/{miniapp/base → miniprogram}/src/common/request.ts

@@ -1,4 +1,4 @@
-import { Request } from '@baic/yolk-miniapp';
+import { Request } from '@baic/yolk-taro-base';
 import { REQUEST_HOST } from '@/constants';
 
 export default new Request({

package/templates/{web/base → miniprogram}/src/common/util.ts

@@ -1,4 +1,4 @@
-import { Util } from '@baic/yolk-web-ui';
+import { Util } from '@baic/yolk';
 
 const util = {
   ...Util,

package/templates/miniprogram/src/constants.ts

@@ -0,0 +1 @@
+export const REQUEST_HOST = '';

package/templates/miniprogram/src/pages/demo/examples/Input.tsx

@@ -0,0 +1,3 @@
+import * as React from 'react';
+import { Input } from '@baic/yolk-miniprogram';
+export default () => <Input />;

package/templates/miniprogram/src/pages/demo/examples/MobileInput.tsx

@@ -0,0 +1,3 @@
+import * as React from 'react';
+import { MobileInput } from '@baic/yolk-miniprogram';
+export default () => <MobileInput />;

package/templates/miniprogram/src/pages/demo/examples/MoneyInput.tsx

@@ -0,0 +1,3 @@
+import * as React from 'react';
+import { MoneyInput } from '@baic/yolk-miniprogram';
+export default () => <MoneyInput />;

package/templates/miniprogram/src/pages/demo/examples/NumberInput.tsx

@@ -0,0 +1,3 @@
+import * as React from 'react';
+import { NumberInput } from '@baic/yolk-miniprogram';
+export default () => <NumberInput />;

package/templates/miniprogram/src/pages/demo/examples/Textarea.tsx

@@ -0,0 +1,3 @@
+import * as React from 'react';
+import { Textarea } from '@baic/yolk-miniprogram';
+export default () => <Textarea />;

package/templates/miniprogram/src/pages/demo/examples/TimerButton.tsx

@@ -0,0 +1,3 @@
+import * as React from 'react';
+import { TimerButton } from '@baic/yolk-miniprogram';
+export default () => <TimerButton>验证码</TimerButton>;

package/templates/miniprogram/src/pages/demo/examples/usePreload.tsx

@@ -0,0 +1,10 @@
+import * as React from 'react';
+import { View } from '@tarojs/components';
+import { Util } from '@baic/yolk';
+import { usePreload } from '@baic/yolk-miniprogram';
+export default () => {
+  const [wrap] = usePreload(async () => {
+    await Util.delay(1000);
+  });
+  return wrap(<View>页面加载完成显示出来了</View>);
+};

package/templates/miniprogram/src/pages/demo/index.config.ts

@@ -0,0 +1,5 @@
+import { PageConfig } from '@tarojs/taro/types/index';
+
+export default {
+  navigationBarTitleText: 'demo',
+} as PageConfig;

package/templates/miniprogram/src/pages/demo/index.tsx

@@ -0,0 +1,44 @@
+import * as React from 'react';
+
+import { AtTabs, AtTabsPane } from 'taro-ui';
+
+import usePrload from './examples/usePreload';
+import Input from './examples/Input';
+import NumberInput from './examples/NumberInput';
+import MobileInput from './examples/MobileInput';
+import MoneyInput from './examples/MoneyInput';
+import Textarea from './examples/Textarea';
+import TimerButton from './examples/TimerButton';
+
+const tabs: Record<string, React.FunctionComponent> = {
+  usePrload,
+  Input,
+  NumberInput,
+  MobileInput,
+  MoneyInput,
+  Textarea,
+  TimerButton,
+};
+
+export default () => {
+  const [current, setCurrent] = React.useState(0);
+  const onClickHandler = React.useCallback((i: number) => setCurrent(i), []);
+  const keys = Object.keys(tabs);
+  return (
+    <AtTabs
+      scroll
+      current={current}
+      onClick={onClickHandler}
+      tabList={keys.map((key) => ({ title: key }))}
+    >
+      {keys.map((key, index) => {
+        const tab = tabs[key];
+        return (
+          <AtTabsPane current={current} index={index}>
+            {React.createElement(tab)}
+          </AtTabsPane>
+        );
+      })}
+    </AtTabs>
+  );
+};

package/templates/miniprogram/src/pages/index/index.module.scss

@@ -0,0 +1,3 @@
+.page {
+  min-height: 100%;
+}

package/templates/{miniapp/base → miniprogram}/src/pages/index/index.tsx

@@ -1,7 +1,5 @@
-import * as React from 'react';
-
 import { View } from '@tarojs/components';
 
 import style from './index.module.scss';
 
-export default () => <View className={style.page}>Hello world</View>;
+export default () => <View className={style.page}>Hello world</View>;

package/templates/miniprogram/src/theme.scss

@@ -0,0 +1,4 @@
+/* Custom Theme */
+// $color-brand: #6eca5b;
+// $color-brand-light: #92d784;
+// $color-brand-dark: #58a249;

package/templates/{miniapp/base → miniprogram}/tsconfig.json

@@ -18,17 +18,11 @@
     "jsx": "react",
     "allowJs": true,
     "resolveJsonModule": true,
-    "typeRoots": [
-      "node_modules/@types",
-      "global.d.ts"
-    ],
+    "typeRoots": ["node_modules/@types", "global.d.ts"],
     "paths": {
       "@/*": ["src/*"]
-    },
+    }
   },
-  "exclude": [
-    "node_modules",
-    "dist"
-  ],
+  "exclude": ["node_modules", "dist"],
   "compileOnSave": false
 }

package/templates/mobile/{base/.stylelintrc.json → .stylelintrc.json}

@@ -1,3 +1,3 @@
 {
   "extends": "@baic/stylelint-config-yolk"
-}
+}

package/templates/mobile/{base/.umirc.ts.tpl → .umirc.ts.tpl}

@@ -1,4 +1,4 @@
-import defineConfig from '@baic/yolk-mobile-ui/lib/define-config';
+import defineConfig from '@baic/yolk-umi-mobile/lib/define-config';
 
 export default defineConfig({
   title: '{{ projectName }}',

package/templates/{miniapp/base → mobile}/README.md.tpl

@@ -1,18 +1,22 @@
-# {{ projectName }}
+# mobile
 
 ## Getting Started
 
 Install dependencies,
 
 {{ #dependenciesInstallType }}
+
 ```bash
 $ {{ dependenciesInstallType }} install
 ```
+
 {{ /dependenciesInstallType }}
 {{ ^dependenciesInstallType }}
+
 ```bash
 $ yarn install
 ```
+
 {{ /dependenciesInstallType }}
 
 Start the dev server,
@@ -27,4 +31,4 @@ Build,
 $ npm run build
 ```
 
-[查阅文档](https://303394539.github.io/yolk-docs/)
+[查阅文档](https://303394539.github.io/yolk-docs/)

package/templates/{web/base → mobile}/package.json.tpl

@@ -3,10 +3,9 @@
   "name": "{{ projectName }}",
   "scripts": {
     "start": "yolk start",
-    "build": "yolk build",
-    "test": "yolk test"
+    "build": "yolk build"
   },
   "dependencies": {
-    "@baic/preset-yolk-web": "1.x"
+    "@baic/preset-yolk-mobile": "~2.0.1-alpha.10"
   }
 }

package/templates/mobile/src/app.tsx

@@ -0,0 +1,24 @@
+import * as React from 'react';
+
+import { Provider } from '@baic/yolk-browser-base';
+
+import { Provider as WebProvider } from '@baic/yolk-mobile';
+
+import request from '@/common/request';
+
+import '@baic/yolk-mobile/lib/style/index.less';
+
+export function rootContainer(container: React.ReactNode) {
+  return (
+    <Provider request={request}>
+      <WebProvider
+        iconfontScriptUrl={[
+          '//at.alicdn.com/t/font_1788044_0dwu4guekcwr.js',
+          '//at.alicdn.com/t/font_1788592_a5xf2bdic3u.js',
+        ]}
+      >
+        {container}
+      </WebProvider>
+    </Provider>
+  );
+}

package/templates/mobile/src/common/request.ts

@@ -0,0 +1,3 @@
+import { Request } from '@baic/yolk-browser-base';
+
+export default new Request();

package/templates/{miniapp/base → mobile}/src/common/util.ts

@@ -1,4 +1,4 @@
-import { Util } from '@baic/yolk-miniapp';
+import { Util } from '@baic/yolk-mobile';
 
 const util = {
   ...Util,

package/templates/mobile/{base/src → src}/global.less

@@ -1,3 +1,3 @@
 #yolk-app {
   height: 100%;
-}
+}