create-pubinfo 2.0.0-rc.2 → 2.0.0-rc.4

package/dist/index.js

@@ -19,7 +19,7 @@ import { rimrafSync } from "rimraf";
 //#region package.json
 var name = "create-pubinfo";
 var type = "module";
-var version = "2.0.0-rc.2";
+var version = "2.0.0-rc.4";
 var description = "初始化项目框架";
 var author = "Werheng <werheng.zhang@gmail.com>";
 var license = "MIT";
@@ -86,8 +86,7 @@ function copyDir(srcDir, destDir) {
 	}
 }
 function copy(src, dest) {
-	const stat = fs.statSync(src);
-	if (stat.isDirectory()) copyDir(src, dest);
+	if (fs.statSync(src).isDirectory()) copyDir(src, dest);
 	else fs.copyFileSync(src, dest);
 }
 async function readJSON(path) {
@@ -107,8 +106,7 @@ function assignValues(target, source) {
 	for (const [key, value] of Object.entries(source)) target[key] = value;
 }
 function validateInput(input$1) {
-	const forbiddenChars = /[<>:"/\\|?*\s]/;
-	if (forbiddenChars.test(input$1)) return "错误提示: 该值不能包含空格或者非法字符 (例如, <>:\"/\\|?*).";
+	if (/[<>:"/\\|?*\s]/.test(input$1)) return "错误提示: 该值不能包含空格或者非法字符 (例如, <>:\"/\\|?*).";
 	return true;
 }
 
@@ -127,8 +125,7 @@ function generate(options, version$1) {
 		return content.replace(/enabled:[^,]+,/g, `enabled: ${options.openapi},`);
 	});
 	rewriteFile(resolve(targetPath, "package.json"), (content) => {
-		const pattern = /"(@?pubinfo(?:\/module-(?:auth|rbac))?)":\s*"[^"]+"/g;
-		return content.replace(pattern, (_match, pkgName) => {
+		return content.replace(/"(@?pubinfo(?:\/module-(?:auth|rbac))?)":\s*"[^"]+"/g, (_match, pkgName) => {
 			return `"${pkgName}": "${version$1}"`;
 		});
 	});
@@ -175,8 +172,7 @@ async function fetchData() {
 	});
 	spinner.start();
 	try {
-		const version$1 = await fetchVersion();
-		return { version: version$1 };
+		return { version: await fetchVersion() };
 	} catch (error) {
 		if (error.message.includes(REMOTE_URL)) error.message = error.message.replace(REMOTE_URL, "[REMOTE_URL]");
 		consola.error(`网络连接异常: ${error.message}`);
@@ -202,20 +198,17 @@ async function init() {
 			validate: validateInput
 		});
 		if (existsSync(answer.dir)) {
-			const overwrite = await confirm({ message: `目录 ${colors.cyan(answer.dir)} 已存在，是否覆盖？` });
-			if (!overwrite) throw Error;
+			if (!await confirm({ message: `目录 ${colors.cyan(answer.dir)} 已存在，是否覆盖？` })) throw Error;
 		}
 		answer.openapi = await confirm({
 			message: "运行时自动生成接口对接文件，若关闭可通过指令生成（openapi）",
 			default: false
 		});
-		const V1orV2 = await select({
+		if (await select({
 			message: "使用 v1 or v2 版本？",
 			default: "v2",
 			choices: ["v1", "v2"]
-		});
-		const isV1 = V1orV2 === "v1";
-		if (isV1) {
+		}) === "v1") {
 			const { version: version$1 } = await fetchData();
 			answer.optionsV1 = JSON.parse(JSON.stringify(answer));
 			answer.optionsV1.version = await select({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "create-pubinfo",
   "type": "module",
-  "version": "2.0.0-rc.2",
+  "version": "2.0.0-rc.4",
   "description": "初始化项目框架",
   "author": "Werheng <werheng.zhang@gmail.com>",
   "license": "MIT",

package/templates/pubinfo-template/_gitignore

@@ -1,6 +1,7 @@
 .pubinfo
 .eslintcache
 .stylelintcache
+.gitmessage
 
 # auto generated
 auto-imports.d.ts

package/templates/pubinfo-template/package.json

@@ -8,7 +8,8 @@
     "build": "pubinfo build",
     "preview": "pubinfo preview",
     "commit": "pubinfo commit",
-    "prepare": "pubinfo commit --init && simple-git-hooks",
+    "prepare": "pubinfo setup && pubinfo commit --init",
+    "lint": "pnpm run lint:eslint && pnpm run lint:stylelint",
     "lint:eslint": "eslint . --cache --fix",
     "lint:stylelint": "stylelint \"src/**/*.{css,scss,vue}\" --cache --fix",
     "viewer:eslint-rule": "pnpx @eslint/config-inspector",
@@ -36,12 +37,12 @@
     "typescript": "^5.8.3"
   },
   "simple-git-hooks": {
-    "pre-commit": "pnpm lint-staged && pnpm run lint",
+    "pre-commit": "pnpm lint-staged",
     "commit-msg": "pnpm exec pubinfo commit --edit $1"
   },
   "lint-staged": {
     "*.{vue,js,ts,jsx,tsx,md,json}": "eslint --cache --fix",
-    "*.{css,scss,vue}": "stylelint --cache --fix"
+    "*.{css,less,scss,vue}": "stylelint --cache --fix"
   },
   "config": {
     "commitizen": {

package/templates/pubinfo-template/src/layouts/index.vue

@@ -2,10 +2,8 @@
 import {
   Copyright,
   Layout,
-  LayoutContent,
-  LayoutHeader,
-  LayoutProvider,
   Logo,
+  Tool,
   Tools,
 } from 'pubinfo';
 
@@ -14,25 +12,33 @@ const dev = import.meta.env.DEV;
 </script>
 
 <template>
-  <LayoutProvider :app-title="title" :is-dev="dev">
+  <Layout.Provider :app-title="title" :is-dev="dev">
     <Layout>
       <template #header>
-        <LayoutHeader>
+        <Layout.Header>
           <template #logo>
             <Logo name="logo" />
           </template>
 
           <template #tools>
-            <Tools />
+            <Tools>
+              <Tool.Fullscreen />
+              <Tool.PageReload />
+              <Tool.DarkModeToggle />
+            </Tools>
           </template>
-        </LayoutHeader>
+        </Layout.Header>
       </template>
 
-      <LayoutContent />
+      <template #sidebar>
+        <Layout.Sidebar />
+      </template>
+
+      <Layout.Content />
 
       <template #footer>
         <Copyright />
       </template>
     </Layout>
-  </LayoutProvider>
+  </Layout.Provider>
 </template>

package/templates/pubinfo-template/src/views/system/login/components/LoginWithPhone.vue

@@ -120,7 +120,7 @@ async function submit() {
   try {
     await phoneForm.value?.validate();
 
-    // TODO 实现手机号登录逻辑
+    // 实现手机号登录逻辑
 
     if (formState.checked) {
       localStorage.setItem('pubinfo_web_savedPhone', formState.phone);