create-pubinfo 2.1.3 → 2.1.5

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as validateInput, n as readPackageJSON, r as run, t as bootstrop } from "./helper-DTE6TM8O.js";
+import { a as validateInput, n as readPackageJSON, r as run, t as bootstrop } from "./helper.js";
 import { checkbox, confirm, input, select } from "@inquirer/prompts";
 import { logger } from "@pubinfo/shared";
 import { Command } from "commander";

package/dist/{helper-DTE6TM8O.js → helper.js}

@@ -7,6 +7,7 @@ import { copy } from "fs-extra";
 import fs, { existsSync, renameSync } from "node:fs";
 import colors from "ansi-colors";
 import nodePlop from "node-plop";
+import { spawn } from "node:child_process";
 import fonts from "cfonts";
 
 //#region src/core/copy.ts
@@ -20,13 +21,51 @@ async function copyTemplate(options) {
 	await copy(resolve(templateDir, templateName), targetDir);
 }
 
+//#endregion
+//#region src/git.ts
+function runGitCommand(args, cwd$1) {
+	return new Promise((resolvePromise, rejectPromise) => {
+		const child = spawn("git", args, {
+			cwd: cwd$1,
+			stdio: "ignore"
+		});
+		child.on("error", rejectPromise);
+		child.on("close", (code) => {
+			if (code === 0) {
+				resolvePromise();
+				return;
+			}
+			rejectPromise(/* @__PURE__ */ new Error(`git ${args.join(" ")} exited with code ${code}`));
+		});
+	});
+}
+async function initGitRepository(targetDir) {
+	if (!targetDir || !existsSync(targetDir)) return;
+	if (existsSync(resolve(targetDir, ".git"))) {
+		logger.info("检测到已存在 Git 仓库，跳过初始化。");
+		return;
+	}
+	try {
+		await runGitCommand(["init"], targetDir);
+		logger.success("已在项目目录中初始化 Git 仓库。");
+	} catch (error) {
+		logger.warn("Git 初始化失败，请手动执行 `git init`。");
+		logger.debug(error);
+	}
+}
+
 //#endregion
 //#region src/core/generate.ts
 const __dirname = dirname(fileURLToPath(import.meta.url));
+const RBAC_FILE_PATHS = {
+	"pubinfo-app": ["src/modules/rbac.ts"],
+	"pubinfo-module": ["playground/src/modules/rbac.ts"],
+	"pubinfo-monorepo": ["apps/basic/src/modules/rbac.ts", "src/modules/rbac.ts"]
+};
 async function generate(options) {
 	const root = cwd();
 	const plop = await nodePlop();
-	const { templateName, templateDir, targetDir } = {
+	const { templateName, templateDir, targetDir, templatePath } = {
 		templateDir: resolve(__dirname, "../templates"),
 		targetDir: options.dir ? resolve(root, options.dir) : void 0,
 		openapi: false,
@@ -37,32 +76,34 @@ async function generate(options) {
 		...options,
 		rbac: options.modules.includes("rbac")
 	};
+	const baseTemplateDir = templatePath || resolve(templateDir, templateName);
+	const normalizedBase = baseTemplateDir.replace(/\\/g, "/");
 	plop.setGenerator("generate", { actions: () => {
 		return [{
 			type: "addMany",
 			destination: targetDir,
-			base: `${templateDir}/${templateName}`.replace(/\\/g, "/"),
-			templateFiles: `${templateDir}/${templateName}/**/*.hbs`.replace(/\\/g, "/"),
+			base: normalizedBase,
+			templateFiles: `${normalizedBase}/**/*.hbs`,
 			globOptions: { dot: true }
 		}, async function copyRawFiles() {
-			const baseDir = resolve(templateDir, templateName);
+			const skipRbacFiles = new Set(RBAC_FILE_PATHS[templateName] || []);
 			async function walk(dir) {
 				const entries = await fs.promises.readdir(dir, { withFileTypes: true });
 				for (const e of entries) {
 					const srcPath = resolve(dir, e.name);
-					const rel = relative(baseDir, srcPath).split(sep).join(posix.sep);
+					const rel = relative(baseTemplateDir, srcPath).split(sep).join(posix.sep);
 					if (e.isDirectory()) {
 						await walk(srcPath);
 						continue;
 					}
 					if (e.name.endsWith(".hbs")) continue;
-					if (!plopOptions.rbac && rel === "src/modules/rbac.ts") continue;
+					if (!plopOptions.rbac && skipRbacFiles.has(rel)) continue;
 					const targetPath = resolve(targetDir, rel);
 					await fs.promises.mkdir(dirname(targetPath), { recursive: true });
 					await fs.promises.copyFile(srcPath, targetPath);
 				}
 			}
-			await walk(baseDir);
+			await walk(baseTemplateDir);
 			return `Copied raw files from ${templateName}`;
 		}];
 	} });
@@ -75,6 +116,7 @@ async function generate(options) {
 		const newPath = resolve(targetDir, newName || oldName);
 		if (existsSync(oldPath)) renameSync(oldPath, newPath);
 	}
+	await initGitRepository(targetDir);
 	logger.success(`${colors.green("项目模板初始化完成.")}`);
 }
 
@@ -91,12 +133,12 @@ async function interaction() {
 	try {
 		const answer = {};
 		answer.dir = await input({
-			message: "目录名称（dir）",
+			message: "目录名称 (dir)",
 			default: "my-app",
 			validate: validateInput
 		});
 		answer.key = await input({
-			message: "项目标识（key）",
+			message: "项目标识 (key)",
 			default: answer.dir,
 			validate: validateInput
 		});
@@ -106,18 +148,25 @@ async function interaction() {
 		answer.templateName = await select({
 			message: "选择模板类型",
 			default: "pubinfo-app",
-			choices: [{
-				name: "Web应用（app）",
-				value: "pubinfo-app"
-			}, {
-				name: "模块插件（module）",
-				value: "pubinfo-module"
-			}]
+			choices: [
+				{
+					name: "Web应用 (app)",
+					value: "pubinfo-app"
+				},
+				{
+					name: "Web应用 (monorepo)",
+					value: "pubinfo-monorepo"
+				},
+				{
+					name: "模块插件 (module)",
+					value: "pubinfo-module"
+				}
+			]
 		});
 		answer.modules = await checkbox({
 			message: "选择需要的模块",
 			choices: [{
-				name: "用户权限管理（RBAC）",
+				name: "用户权限管理 (RBAC)",
 				value: "rbac",
 				checked: true
 			}]
@@ -147,14 +196,17 @@ async function run(version$1) {
 var package_default = {
 	name: "create-pubinfo",
 	type: "module",
-	version: "2.1.3",
+	version: "2.1.5",
 	description: "初始化项目框架",
 	author: "Werheng <werheng.zhang@gmail.com>",
 	license: "MIT",
-	exports: { ".": {
-		"types": "./dist/index.d.ts",
-		"default": "./dist/index.js"
-	} },
+	exports: {
+		".": {
+			"types": "./dist/index.d.ts",
+			"default": "./dist/index.js"
+		},
+		"./package.json": "./package.json"
+	},
 	main: "./dist/index.js",
 	module: "./dist/index.js",
 	types: "./dist/index.d.ts",

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 //#region src/interface.d.ts
-type TemplateName = 'pubinfo-app' | 'pubinfo-module';
+type TemplateName = 'pubinfo-app' | 'pubinfo-module' | 'pubinfo-monorepo';
 type Module = 'rbac';
 interface Options {
   /**
@@ -28,6 +28,10 @@ interface GenerateOptions extends Options {
    * 版本号
    */
   version: string;
+  /**
+   * 自定义模板目录
+   */
+  templatePath?: string;
   /**
    * 模板文件夹
    */
@@ -77,6 +81,7 @@ declare function readPackageJSON(): {
       types: string;
       default: string;
     };
+    "./package.json": string;
   };
   main: string;
   module: string;

package/dist/index.js

@@ -1,3 +1,3 @@
-import { i as interaction, n as readPackageJSON, o as generate, r as run, s as copyTemplate } from "./helper-DTE6TM8O.js";
+import { i as interaction, n as readPackageJSON, o as generate, r as run, s as copyTemplate } from "./helper.js";
 
 export { copyTemplate, generate, interaction, readPackageJSON, run };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "create-pubinfo",
   "type": "module",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "description": "初始化项目框架",
   "author": "Werheng <werheng.zhang@gmail.com>",
   "license": "MIT",
@@ -9,7 +9,8 @@
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
-    }
+    },
+    "./package.json": "./package.json"
   },
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -37,7 +38,7 @@
     "ora": "^8.2.0",
     "rimraf": "^6.0.1",
     "semver": "^7.7.2",
-    "@pubinfo/shared": "2.1.3"
+    "@pubinfo/shared": "2.1.5"
   },
   "devDependencies": {
     "@types/node": "^24.0.10"

package/templates/pubinfo-monorepo/.browserslistrc

@@ -0,0 +1,5 @@
+# Browsers that we support
+
+last 2 version
+> 1%
+not dead # no browsers without security updates

package/templates/pubinfo-monorepo/.editorconfig

@@ -0,0 +1,10 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+quote_type = single

package/templates/pubinfo-monorepo/.vscode/settings.json

@@ -0,0 +1,50 @@
+{
+  // Disable the default formatter, use eslint instead
+  "prettier.enable": false,
+  "editor.formatOnSave": false,
+
+  // Auto fix
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit",
+    "source.organizeImports": "never"
+  },
+
+  // Silent the stylistic rules in you IDE, but still auto fix them
+  "eslint.rules.customizations": [
+    { "rule": "style/*", "severity": "off", "fixable": true },
+    { "rule": "format/*", "severity": "off", "fixable": true },
+    { "rule": "*-indent", "severity": "off", "fixable": true },
+    { "rule": "*-spacing", "severity": "off", "fixable": true },
+    { "rule": "*-spaces", "severity": "off", "fixable": true },
+    { "rule": "*-order", "severity": "off", "fixable": true },
+    { "rule": "*-dangle", "severity": "off", "fixable": true },
+    { "rule": "*-newline", "severity": "off", "fixable": true },
+    { "rule": "*quotes", "severity": "off", "fixable": true },
+    { "rule": "*semi", "severity": "off", "fixable": true }
+  ],
+
+  // Enable eslint for all supported languages
+  "eslint.validate": [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact",
+    "vue",
+    "html",
+    "markdown",
+    "json",
+    "jsonc",
+    "yaml",
+    "toml",
+    "xml",
+    "gql",
+    "graphql",
+    "astro",
+    "svelte",
+    "css",
+    "less",
+    "scss",
+    "pcss",
+    "postcss"
+  ]
+}

package/templates/pubinfo-monorepo/_gitignore

@@ -0,0 +1,38 @@
+.pubinfo
+.eslintcache
+.stylelintcache
+.gitmessage
+
+# auto generated
+auto-imports.d.ts
+components.d.ts
+
+.DS_Store
+node_modules
+dist
+cache
+coverage
+.turbo
+.eslintcache
+.stylelintcache
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+# Editor directories and files
+.idea
+# .vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+

package/templates/pubinfo-monorepo/_npmrc

@@ -0,0 +1,5 @@
+ignore-workspace-root-check=true
+shamefully-hoist=true
+strict-peer-dependencies=false
+shell-emulator=true
+max-old-space-size=4096

package/templates/pubinfo-monorepo/apps/basic/.env

@@ -0,0 +1,2 @@
+# 页面标题
+VITE_APP_TITLE = 产数开发底座

package/templates/pubinfo-monorepo/apps/basic/.env.development

@@ -0,0 +1,4 @@
+# 接口请求地址，会设置到 axios 的 baseURL 参数上
+VITE_APP_API_BASEURL = http://localhost:9099/pubinfo-sys
+# 是否开启代理
+VITE_OPEN_PROXY = false

package/templates/pubinfo-monorepo/apps/basic/.env.production

@@ -0,0 +1,10 @@
+# 接口请求地址，会设置到 axios 的 baseURL 参数上
+VITE_APP_API_BASEURL = /pubinfo-sys
+# 是否在打包时启用 Mock
+VITE_BUILD_MOCK = false
+# 是否在打包时生成 sourcemap
+VITE_BUILD_SOURCEMAP = false
+# 是否在打包时开启压缩，支持 gzip 和 brotli，例如 gzip,brotli
+VITE_BUILD_COMPRESS =
+# 是否在打包时启用传统浏览器兼容，可在 .browserslistrc 中进行具体配置
+VITE_BUILD_LEGACY = false

package/templates/pubinfo-monorepo/apps/basic/index.html

@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" href="src/assets/icons/logo.svg"  type="image/svg+xml"/>
+    <link rel="stylesheet" href="/loading.css" />
+    <link rel="stylesheet" href="/browser_upgrade/index.css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta http-equiv="Expires" content="0">
+    <meta http-equiv="Pragma" content="no-cache">
+    <meta http-equiv="Cache-control" content="no-cache">
+    <meta http-equiv="Cache" content="no-cache">
+    <title>%VITE_APP_TITLE%</title>
+  </head>
+  <body>
+    <div id="app">
+      <div class="w-admin-home">
+        <div class="loading">
+          <div class="square"></div>
+          <div class="square"></div>
+          <div class="square"></div>
+          <div class="square"></div>
+        </div>
+        <div class="text">载入中</div>
+      </div>
+      <div id="browser-upgrade">
+        <div class="title">为了您的体验，推荐使用以下浏览器</div>
+        <div class="browsers">
+          <a href="https://www.microsoft.com/edge" target="_blank" class="browser">
+            <img class="browser-icon" src="/browser_upgrade/edge.png" />
+            <div class="browser-name">Mircosoft Edge</div>
+          </a>
+          <a href="https://www.google.cn/chrome/" target="_blank" class="browser">
+            <img class="browser-icon" src="/browser_upgrade/chrome.png" />
+            <div class="browser-name">Google Chrome</div>
+          </a>
+        </div>
+      </div>
+    </div>
+    <script>
+      if (!!window.ActiveXObject || 'ActiveXObject' in window) {
+        document.getElementById('browser-upgrade').style.display = 'block';
+      }
+    </script>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>

package/templates/pubinfo-monorepo/apps/basic/openapi.config.ts.hbs

@@ -0,0 +1,33 @@
+import { defineConfig } from '@pubinfo/openapi';
+import { presetName } from '@pubinfo/preset-openapi';
+
+export default defineConfig({
+  enabled: {{openapi}},
+
+  presets: [
+    // 小驼峰式命名
+    presetName({
+      functionName: 'camelCase',
+    }),
+  ],
+
+  imports: { '@/api/request': [{ name: 'basic', as: 'request' }] },
+  batch: [
+    {
+      input: 'http://localhost:9099/pubinfo-sys/v3/api-docs/auth',
+      output: './src/api/modules/auth',
+      imports: { '@/api/request': [{ name: 'auth', as: 'request' }] },
+    },
+  ],
+
+  hooks: {
+    customType(schema, namespace, defaultFn) {
+      // `int64` 在前端会精度丢失，可在此处调整对应字段的 `TS类型`
+      if (schema?.type === 'integer' && schema?.format === 'int64') {
+        return 'number';
+      }
+
+      return defaultFn(schema, namespace);
+    },
+  },
+});

package/templates/pubinfo-monorepo/apps/basic/package.json.hbs

@@ -0,0 +1,26 @@
+{
+  "name": "pubinfo-template",
+  "type": "module",
+  "private": true,
+  "scripts": {
+    "dev": "pubinfo dev",
+    "build": "pubinfo build",
+    "preview": "pubinfo preview",
+    "upgrade": "pubinfo upgrade",
+    "prepare": "pubinfo setup",
+    "openapi": "pnpx @pubinfo/openapi generate",
+    "icon:normalize": "pubinfo icon"
+  },
+  "dependencies": {
+    "@pubinfo/module-captcha": "{{version}}",
+    {{#if rbac}}
+    "@pubinfo/module-rbac": "{{version}}",
+    {{/if}}
+    "@vueuse/core": "^14.0.0",
+    "pubinfo": "{{version}}"
+  },
+  "devDependencies": {
+    "@pubinfo/openapi": "^0.9.1",
+    "@pubinfo/preset-openapi": "^0.9.1"
+  }
+}

package/templates/pubinfo-monorepo/apps/basic/pubinfo.config.ts

@@ -0,0 +1,9 @@
+import { definePubinfoConfig } from 'pubinfo/node';
+
+export default definePubinfoConfig({
+  vite: {
+    server: {
+      port: 5173,
+    },
+  },
+});

package/templates/pubinfo-monorepo/apps/basic/public/browser_upgrade/index.css

@@ -0,0 +1,49 @@
+#browser-upgrade {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 10001;
+  display: none;
+  width: 100%;
+  height: 100%;
+  color: #736477;
+  user-select: none;
+  background-color: snow;
+}
+
+#browser-upgrade .title {
+  margin: 40px 0;
+  font-size: 24px;
+  text-align: center;
+}
+
+#browser-upgrade .browsers {
+  text-align: center;
+}
+
+#browser-upgrade .browsers .browser {
+  display: inline-block;
+  margin: 0 20px;
+  text-decoration: none;
+  cursor: pointer;
+}
+
+#browser-upgrade .browsers .browser .browser-icon {
+  display: block;
+  width: 50px;
+  height: 50px;
+  margin: 0 auto;
+  border: none;
+}
+
+#browser-upgrade .browsers .browser .browser-name {
+  padding-bottom: 2px;
+  margin-top: 10px;
+  color: #736477;
+  text-align: center;
+  border-bottom: 1px solid transparent;
+}
+
+#browser-upgrade .browsers .browser:hover .browser-name {
+  border-bottom: 1px solid #736477;
+}

package/templates/pubinfo-monorepo/apps/basic/public/loading.css

@@ -0,0 +1,92 @@
+#app {
+  height: 100%;
+}
+
+.w-admin-home {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 10000;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+  color: #736477;
+  user-select: none;
+  background-color: snow;
+}
+
+.w-admin-home .loading {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: center;
+  width: 40px;
+  height: 40px;
+}
+
+.w-admin-home .loading .square {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 20px;
+  height: 20px;
+}
+
+.w-admin-home .loading .square::before {
+  width: 10px;
+  height: 10px;
+  content: "";
+  border: 3px solid #8c858f;
+  border-radius: 15%;
+  animation: square-to-dot-animation 2s linear infinite;
+}
+
+.w-admin-home .loading .square:nth-child(1)::before {
+  animation-delay: calc(150ms * 1);
+}
+
+.w-admin-home .loading .square:nth-child(2)::before {
+  animation-delay: calc(150ms * 2);
+}
+
+.w-admin-home .loading .square:nth-child(3)::before {
+  animation-delay: calc(150ms * 3);
+}
+
+.w-admin-home .loading .square:nth-child(4)::before {
+  animation-delay: calc(150ms * 4);
+}
+
+@keyframes square-to-dot-animation {
+  15%,
+  25% {
+    width: 0;
+    height: 0;
+    margin: 5px;
+    border-width: 5px;
+    border-radius: 100%;
+  }
+
+  40% {
+    width: 10px;
+    height: 10px;
+    margin: initial;
+    border-width: 3px;
+    border-radius: 15%;
+  }
+}
+
+.w-admin-home .text {
+  position: relative;
+  margin-top: 20px;
+  font-size: 24px;
+}
+
+.w-admin-home .text::after {
+  position: absolute;
+  padding-left: 5px;
+  content: "…";
+}

package/templates/pubinfo-monorepo/apps/basic/src/App.vue

@@ -0,0 +1,7 @@
+<template>
+  <UIProvider>
+    <PubinfoProvider>
+      <PubinfoApp />
+    </PubinfoProvider>
+  </UIProvider>
+</template>

package/templates/pubinfo-monorepo/apps/basic/src/api/modules/auth/index.ts

@@ -0,0 +1,3 @@
+// API 更新时间：
+// API 唯一标识：
+export * from './renzhengfuwu';