@tomjs/create-app 0.2.1 → 0.2.3

package/dist/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import a from"fs";import Z from"os";import l from"path";import{fileURLToPath as ee}from"url";import{blue as v,cyan as te,green as ne,red as U,reset as d,yellow as j}from"kolorist";import{camelCase as re}from"lodash-es";import oe from"minimist";import ie from"prompts";import w from"shelljs";import p from"fs";import E from"path";function M(e){return[["t","template"]].forEach(([t,r])=>{e[r]=e[r]??e[t]}),e}function V(e){let t=p.readdirSync(e);return t.length===0||t.length===1&&t[0]===".git"}function x(e){return e?.trim().replace(/\/+$/g,"")}function Y(e,t){p.mkdirSync(t,{recursive:!0});for(let r of p.readdirSync(e)){let f=E.resolve(e,r),h=E.resolve(t,r);F(f,h)}}function F(e,t){p.statSync(e).isDirectory()?Y(e,t):p.copyFileSync(e,t)}function z(e){if(p.existsSync(e))for(let t of p.readdirSync(e))t!==".git"&&p.rmSync(E.resolve(e,t),{recursive:!0,force:!0})}function N(e){return/^(?:@[a-z\d\-*~][a-z\d\-*._~]*\/)?[a-z\d\-~][a-z\d\-._~]*$/.test(e)}function W(e){return e.trim().toLowerCase().replace(/\s+/g,"-").replace(/^[._]/,"").replace(/[^a-z\d\-~]+/g,"-")}function I(e){if(!e)return;let r=e.split(" ")[0].split("/");return{name:r[0],version:r[1]}}var $=M(oe(process.argv.slice(2),{string:["_"]})),R=process.cwd(),B=[{name:"vue",display:"Vue",color:ne,variants:[{name:"vue",display:"Web",color:v},{name:"electron-vue",display:"Electron",color:j}]},{name:"react",display:"React",color:te,variants:[{name:"react",display:"Web",color:v},{name:"electron-react",display:"Electron",color:j}]},{name:"node",display:"Node",color:v,publish:!0,variants:[{name:"node",display:"Base",color:v},{name:"node-electron",display:"Electron",color:j}]}],L=B.map(e=>e.variants&&e.variants.map(t=>t.name)||[e.name]).reduce((e,t)=>e.concat(t),[]),ae={_gitignore:".gitignore","_lintstagedrc.cjs":".lintstagedrc.cjs"},P="my-app";function J(e){let t=w.exec(`git config --get ${e}`,{silent:!0});if(t.code===0)return t.stdout.trim()}async function se(){let e=x($._[0]),t=$.template||$.t,r=e||P,f=()=>r==="."?l.basename(l.resolve()):r,h={};h=await ie([{type:e?null:"text",name:"projectName",message:d("Project name:"),initial:P,onState:n=>{r=x(n.value)||P}},{type:()=>!a.existsSync(r)||V(r)?null:"toggle",name:"overwrite",message:()=>(r==="."?"Current directory":`Target directory "${r}"`)+" is not empty. Remove existing files and continue?",initial:!1,active:"yes",inactive:"no"},{type:(n,{overwrite:o})=>{if(o===!1)throw console.log(U("\u2716")+" Operation cancelled"),new Error;return null},name:"overwriteChecker"},{type:()=>N(f())?null:"text",name:"packageName",message:d("Package name:"),initial:()=>W(f()),validate:n=>N(n)||"Invalid package.json name"},{type:t&&L.includes(t)?null:"select",name:"framework",message:typeof t=="string"&&!L.includes(t)?d(`"${t}" isn't a valid template. Please choose from below: `):d("Select a framework:"),initial:0,choices:B.map(n=>{let o=n.color;return{title:o(n.display||n.name),value:n}})},{type:n=>n&&n.variants?"select":null,name:"variant",message:d("Select a variant:"),choices:n=>n?.variants?.map(o=>{let i=o.color;return{title:i(o.display||o.name),value:o.name}})},{type:(n,o)=>{let{variant:i,framework:u}=o,{publish:y,variants:X}=u||{};if(!(!y&&!X?.find(O=>O.name===i&&O.publish)))return"toggle"},name:"publish",message:d("Whether to publish to the npm repository?"),initial:!0,active:"yes",inactive:"no"}],{onCancel:()=>{throw console.log(U("\u2716")+" Operation cancelled"),new Error}});let{framework:G,overwrite:K,packageName:q,variant:H,publish:C}=h,s=l.join(R,r.substring(r.indexOf("/")+1));K?z(s):a.existsSync(s)||a.mkdirSync(s,{recursive:!0}),console.log(`
-Scaffolding project in ${s}...`);let k=H||G?.name||t||"",D=n=>l.join(ee(import.meta.url),"../..",`template-${n}`),A=D(k),_=k.includes("node");[A,D("config")].forEach(n=>{let o=a.readdirSync(n);for(let i of o){let u=ae[i]??i;if(_&&i.includes("stylelint"))continue;let y=l.join(s,u);F(l.join(n,i),y)}});let Q=`template-${k}`,c=JSON.parse(a.readFileSync(l.join(A,"package.json"),"utf-8")),m=q||f();c.name=m;let g={name:"UserName",email:"name@github.com"};if(C){w.which("git")&&(g.name=J("user.name")||Z.userInfo().username,g.email=J("user.email")||"",c.author=Object.assign(c.author,g));let n=m.startsWith("@")?m.split("/")[0].substring(1):re(g.name);c.repository.url=`git+https://github.com/${n}/${m.substring(m.indexOf("/")+1)}.git`}else delete c.author,delete c.publishConfig,delete c.repository,delete c.scripts.prepublishOnly,delete c.devDependencies.np;a.writeFileSync(l.join(s,"package.json"),JSON.stringify(c,null,2)+`
-`),_&&["LICENSE","README.md","README.zh_CN.md"].forEach(n=>{let o=l.join(s,n);if(!C&&a.existsSync(o)){a.rmSync(o),n==="README.md"&&a.writeFileSync(o,`# ${m}
-`,{encoding:"utf-8"});return}if(!a.existsSync(o))return;let i=a.readFileSync(o,"utf-8").replace(new RegExp(Q,"g"),m).replace(new RegExp("{{user.name}}","g"),g.name).replace(new RegExp("{{user.email}}","g"),g.email);if(n.startsWith("README")){let u=m.replace("@","%40"),y=m.replace("@","%40").replace(new RegExp("/","g"),"%2F");i=i.replace("{{badges}}",[`![npm](https://img.shields.io/npm/v/${u})`,`![node-current (scoped)](https://img.shields.io/node/v/${u})`,`![NPM](https://img.shields.io/npm/l/${y})`].join(" "))}a.writeFileSync(o,i)});let T=I(process.env.npm_config_user_agent),b=T?T.name:"npm";w.which("git")&&w.exec(`cd ${s} && git init`);let S=l.relative(R,s);switch(console.log(`
+import a,{rmSync as te}from"fs";import ne from"os";import l from"path";import{fileURLToPath as re}from"url";import{blue as v,cyan as oe,green as ie,red as L,reset as d,yellow as N}from"kolorist";import{camelCase as se}from"lodash-es";import ae from"minimist";import ce from"prompts";import k from"shelljs";import p from"fs";import b from"path";function W(e){return[["t","template"]].forEach(([t,o])=>{e[o]=e[o]??e[t]}),e}function z(e){let t=p.readdirSync(e);return t.length===0||t.length===1&&t[0]===".git"}function j(e){return e?.trim().replace(/\/+$/g,"")}function ee(e,t){p.mkdirSync(t,{recursive:!0});for(let o of p.readdirSync(e)){let g=b.resolve(e,o),u=b.resolve(t,o);P(g,u)}}function P(e,t){p.statSync(e).isDirectory()?ee(e,t):p.copyFileSync(e,t)}function I(e){if(p.existsSync(e))for(let t of p.readdirSync(e))t!==".git"&&p.rmSync(b.resolve(e,t),{recursive:!0,force:!0})}function F(e){return/^(?:@[a-z\d\-*~][a-z\d\-*._~]*\/)?[a-z\d\-~][a-z\d\-._~]*$/.test(e)}function U(e){return e.trim().toLowerCase().replace(/\s+/g,"-").replace(/^[._]/,"").replace(/[^a-z\d\-~]+/g,"-")}function V(e){if(!e)return;let o=e.split(" ")[0].split("/");return{name:o[0],version:o[1]}}function R(e,t){let{variant:o,framework:g}=e,u=g;return u[t]||!!u?.variants?.find(y=>y.name===o&&y[t])}var $=W(ae(process.argv.slice(2),{string:["_"]})),D=process.cwd(),G=[{name:"vue",display:"Vue",color:ie,variants:[{name:"vue",display:"Web",color:v},{name:"electron-vue",display:"Electron",color:N}]},{name:"react",display:"React",color:oe,variants:[{name:"react",display:"Web",color:v},{name:"electron-react",display:"Electron",color:N}]},{name:"node",display:"Node",color:v,publish:!0,test:!0,variants:[{name:"node",display:"Base",color:v},{name:"node-electron",display:"Electron",color:N}]}],J=G.map(e=>e.variants&&e.variants.map(t=>t.name)||[e.name]).reduce((e,t)=>e.concat(t),[]),le={_gitignore:".gitignore","_lintstagedrc.cjs":".lintstagedrc.cjs"},A="my-app";function B(e){let t=k.exec(`git config --get ${e}`,{silent:!0});if(t.code===0)return t.stdout.trim()}async function me(){let e=j($._[0]),t=$.template||$.t,o=e||A,g=()=>o==="."?l.basename(l.resolve()):o,u={};u=await ce([{type:e?null:"text",name:"projectName",message:d("Project name:"),initial:A,onState:n=>{o=j(n.value)||A}},{type:()=>!a.existsSync(o)||z(o)?null:"toggle",name:"overwrite",message:()=>(o==="."?"Current directory":`Target directory "${o}"`)+" is not empty. Remove existing files and continue?",initial:!1,active:"yes",inactive:"no"},{type:(n,{overwrite:r})=>{if(r===!1)throw console.log(L("\u2716")+" Operation cancelled"),new Error;return null},name:"overwriteChecker"},{type:()=>F(g())?null:"text",name:"packageName",message:d("Package name:"),initial:()=>U(g()),validate:n=>F(n)||"Invalid package.json name"},{type:t&&J.includes(t)?null:"select",name:"framework",message:typeof t=="string"&&!J.includes(t)?d(`"${t}" isn't a valid template. Please choose from below: `):d("Select a framework:"),initial:0,choices:G.map(n=>{let r=n.color;return{title:r(n.display||n.name),value:n}})},{type:n=>n&&n.variants?"select":null,name:"variant",message:d("Select a variant:"),choices:n=>n?.variants?.map(r=>{let s=r.color;return{title:s(r.display||r.name),value:r.name}})},{type:(n,r)=>R(r,"publish")?"toggle":null,name:"needPublish",message:d("Whether to publish to the npm repository?"),initial:!0,active:"yes",inactive:"no"},{type:(n,r)=>R(r,"test")?"toggle":null,name:"needTest",message:d("Whether to add Test?"),initial:!0,active:"yes",inactive:"no"}],{onCancel:()=>{throw console.log(L("\u2716")+" Operation cancelled"),new Error}});let{framework:y,overwrite:K,packageName:q,variant:H,needPublish:T,needTest:Q}=u,c=l.join(D,o.substring(o.indexOf("/")+1));K?I(c):a.existsSync(c)||a.mkdirSync(c,{recursive:!0}),console.log(`
+Scaffolding project in ${c}...`);let S=H||y?.name||t||"",_=n=>l.join(re(import.meta.url),"../..",`template-${n}`),C=_(S),O=S.includes("node");[C,_("config")].forEach(n=>{let r=a.readdirSync(n);for(let s of r){let h=le[s]??s;if(O&&s.includes("stylelint"))continue;let x=l.join(c,h);P(l.join(n,s),x)}});let X=`template-${S}`,i=JSON.parse(a.readFileSync(l.join(C,"package.json"),"utf-8")),m=q||g();i.name=m;let f={name:"UserName",email:"name@github.com"};Z(),O&&Y();let M=V(process.env.npm_config_user_agent),w=M?M.name:"npm";k.which("git")&&k.exec(`cd ${c} && git init`);let E=l.relative(D,c);switch(console.log(`
 Done. Now run:
-`),s!==R&&console.log(`  cd ${S.includes(" ")?`"${S}"`:S}`),b){case"yarn":console.log("  yarn"),console.log("  yarn dev");break;default:console.log(`  ${b} install`),console.log(`  ${b} run dev`);break}}se().catch(e=>{e.message&&console.error(e)});
+`),c!==D&&console.log(`  cd ${E.includes(" ")?`"${E}"`:E}`),w){case"yarn":console.log("  yarn"),console.log("  yarn dev");break;default:console.log(`  ${w} install`),console.log(`  ${w} run dev`);break}function Y(){["LICENSE","README.md","README.zh_CN.md"].forEach(n=>{let r=l.join(c,n);if(!T&&a.existsSync(r)){a.rmSync(r),n==="README.md"&&a.writeFileSync(r,`# ${m}
+`,{encoding:"utf-8"});return}if(!a.existsSync(r))return;let s=a.readFileSync(r,"utf-8").replace(new RegExp(X,"g"),m).replace(new RegExp("{{user.name}}","g"),f.name).replace(new RegExp("{{user.email}}","g"),f.email);if(n.startsWith("README")){let h=m.replace("@","%40"),x=m.replace("@","%40").replace(new RegExp("/","g"),"%2F");s=s.replace("{{badges}}",[`![npm](https://img.shields.io/npm/v/${h})`,`![node-current (scoped)](https://img.shields.io/node/v/${h})`,`![NPM](https://img.shields.io/npm/l/${x})`].join(" "))}a.writeFileSync(r,s)})}function Z(){if(T){k.which("git")&&(f.name=B("user.name")||ne.userInfo().username,f.email=B("user.email")||"",i.author=Object.assign(i.author,f));let n=m.startsWith("@")?m.split("/")[0].substring(1):se(f.name);i.repository.url=`git+https://github.com/${n}/${m.substring(m.indexOf("/")+1)}.git`}else delete i.author,delete i.publishConfig,delete i.repository,delete i.scripts.prepublishOnly,delete i.devDependencies.np;if(!Q){delete i.scripts.test,["jest.config.js","test"].forEach(r=>{let s=l.join(c,r);a.existsSync(s)&&te(s,{force:!0,recursive:!0})});let n=Object.keys(i.devDependencies||{});Array.isArray(n)&&n.forEach(r=>{r.includes("jest")&&delete i.devDependencies[r]})}a.writeFileSync(l.join(c,"package.json"),JSON.stringify(i,null,2)+`
+`)}}me().catch(e=>{e.message&&console.error(e)});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomjs/create-app",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "create tomjs web app",
   "keywords": [
     "tomjs",
@@ -57,12 +57,12 @@
     "@tomjs/tsconfig": "^1.0.8",
     "@types/lodash-es": "^4.17.12",
     "@types/minimist": "^1.2.5",
-    "@types/node": "^18.19.1",
+    "@types/node": "^18.19.2",
     "@types/prompts": "^2.4.9",
     "@types/shelljs": "^0.8.15",
     "eslint": "^8.55.0",
     "husky": "^8.0.3",
-    "lint-staged": "^15.1.0",
+    "lint-staged": "^15.2.0",
     "np": "^9.0.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.1.0",

package/template-config/.gitattributes

@@ -197,3 +197,7 @@ Procfile    text
 *.xlsx binary
 *.ppt  binary
 *.pptx binary
+
+## EXTENSIONS
+*.crx  binary
+*.xpi  binary

package/template-electron-react/package.json

@@ -33,8 +33,8 @@
     "@tomjs/prettier": "^1.0.6",
     "@tomjs/stylelint": "^1.0.7",
     "@tomjs/tsconfig": "^1.0.8",
-    "@types/node": "^18.19.1",
-    "@types/react": "^18.2.40",
+    "@types/node": "^18.19.2",
+    "@types/react": "^18.2.41",
     "@types/react-dom": "^18.2.17",
     "@types/shelljs": "^0.8.15",
     "@vitejs/plugin-react-swc": "^3.5.0",
@@ -42,7 +42,7 @@
     "electron-builder": "^24.9.1",
     "eslint": "^8.55.0",
     "husky": "^8.0.3",
-    "lint-staged": "^15.1.0",
+    "lint-staged": "^15.2.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.1.0",
     "rimraf": "^5.0.5",
@@ -51,7 +51,7 @@
     "tree-kill": "^1.2.2",
     "tsx": "^4.6.2",
     "typescript": "~5.2.2",
-    "vite": "^5.0.4",
+    "vite": "^5.0.5",
     "vite-plugin-electron": "^0.15.4",
     "vite-plugin-electron-renderer": "^0.14.5"
   }

package/template-electron-vue/package.json

@@ -31,14 +31,14 @@
     "@tomjs/prettier": "^1.0.6",
     "@tomjs/stylelint": "^1.0.7",
     "@tomjs/tsconfig": "^1.0.8",
-    "@types/node": "^18.19.1",
+    "@types/node": "^18.19.2",
     "@types/shelljs": "^0.8.15",
     "@vitejs/plugin-vue": "^4.5.1",
     "electron": "^27.1.3",
     "electron-builder": "^24.9.1",
     "eslint": "^8.55.0",
     "husky": "^8.0.3",
-    "lint-staged": "^15.1.0",
+    "lint-staged": "^15.2.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.1.0",
     "rimraf": "^5.0.5",
@@ -47,7 +47,7 @@
     "tree-kill": "^1.2.2",
     "tsx": "^4.6.2",
     "typescript": "~5.2.2",
-    "vite": "^5.0.4",
+    "vite": "^5.0.5",
     "vite-plugin-electron": "^0.15.4",
     "vite-plugin-electron-renderer": "^0.14.5",
     "vue-tsc": "^1.8.24"

package/template-node/package.json

@@ -56,15 +56,17 @@
     "@tomjs/prettier": "^1.0.6",
     "@tomjs/tsconfig": "^1.0.8",
     "@types/jest": "^29.5.10",
-    "@types/node": "^18.19.1",
+    "@types/node": "^18.19.2",
+    "@types/shelljs": "^0.8.15",
     "eslint": "^8.55.0",
     "husky": "^8.0.3",
     "jest": "^29.7.0",
-    "lint-staged": "^15.1.0",
+    "lint-staged": "^15.2.0",
     "np": "^9.0.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.1.0",
     "rimraf": "^5.0.5",
+    "shelljs": "^0.8.5",
     "ts-jest": "^29.1.1",
     "tsup": "^8.0.1",
     "tsx": "^4.6.2",

package/template-node/tsconfig.json

@@ -2,6 +2,8 @@
   "extends": "@tomjs/tsconfig/node.json",
   "include": [
     "src/**/*.ts",
-    "src/**/*.d.ts"
+    "src/**/*.d.ts",
+    "test/**/*.ts",
+    "test/**/*.d.ts"
   ],
 }

package/template-node-electron/package.json

@@ -57,16 +57,18 @@
     "@tomjs/prettier": "^1.0.6",
     "@tomjs/tsconfig": "^1.0.8",
     "@types/jest": "^29.5.10",
-    "@types/node": "^18.19.1",
+    "@types/node": "^18.19.2",
+    "@types/shelljs": "^0.8.15",
     "electron": "^27.1.3",
     "eslint": "^8.55.0",
     "husky": "^8.0.3",
     "jest": "^29.7.0",
-    "lint-staged": "^15.1.0",
+    "lint-staged": "^15.2.0",
     "np": "^9.0.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.1.0",
     "rimraf": "^5.0.5",
+    "shelljs": "^0.8.5",
     "ts-jest": "^29.1.1",
     "tsup": "^8.0.1",
     "tsx": "^4.6.2",

package/template-react/package.json

@@ -27,17 +27,17 @@
     "@tomjs/prettier": "^1.0.6",
     "@tomjs/stylelint": "^1.0.7",
     "@tomjs/tsconfig": "^1.0.8",
-    "@types/node": "^18.19.1",
-    "@types/react": "^18.2.40",
+    "@types/node": "^18.19.2",
+    "@types/react": "^18.2.41",
     "@types/react-dom": "^18.2.17",
     "@vitejs/plugin-react-swc": "^3.5.0",
     "eslint": "^8.55.0",
     "husky": "^8.0.3",
-    "lint-staged": "^15.1.0",
+    "lint-staged": "^15.2.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.1.0",
     "stylelint": "^15.11.0",
     "typescript": "~5.2.2",
-    "vite": "^5.0.4"
+    "vite": "^5.0.5"
   }
 }

package/template-vue/package.json

@@ -26,16 +26,16 @@
     "@tomjs/prettier": "^1.0.6",
     "@tomjs/stylelint": "^1.0.7",
     "@tomjs/tsconfig": "^1.0.8",
-    "@types/node": "^18.19.1",
+    "@types/node": "^18.19.2",
     "@vitejs/plugin-vue": "^4.5.1",
     "eslint": "^8.55.0",
     "husky": "^8.0.3",
-    "lint-staged": "^15.1.0",
+    "lint-staged": "^15.2.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.1.0",
     "stylelint": "^15.11.0",
     "typescript": "~5.2.2",
-    "vite": "^5.0.4",
+    "vite": "^5.0.5",
     "vue-tsc": "^1.8.24"
   }
 }