@moluoxixi/create-app 2.0.4 → 2.0.402

package/dist/utils/renderTemplate.js

@@ -1,96 +1,164 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import yaml from 'yaml';
-import { deepMerge } from './deepMerge.js';
-import { sortDependencies } from './sortDependencies.js';
+import { FILE_CONSTANTS } from "../constants/index.js";
+import { validatePath } from "./file.js";
+import { deepMerge } from "./deepMerge.js";
+import { sortDependencies } from "./sortDependencies.js";
 /**
  * 渲染模板到目标目录
  * 支持物理路径合并和配置文件深度合并
+ * @param src 源路径
+ * @param dest 目标路径
+ * @throws {Error} 如果路径不安全、文件操作失败
  */
 export function renderTemplate(src, dest) {
-    const stats = fs.statSync(src);
-    if (stats.isDirectory()) {
-        // 如果是目录，递归处理
-        if (path.basename(src) === 'node_modules') {
+    // 验证路径安全性
+    validatePath(src);
+    validatePath(dest);
+    try {
+        const stats = fs.statSync(src);
+        // 处理目录
+        if (stats.isDirectory()) {
+            // 跳过 node_modules 目录
+            if (path.basename(src) === FILE_CONSTANTS.NODE_MODULES) {
+                return;
+            }
+            fs.mkdirSync(dest, { recursive: true });
+            for (const file of fs.readdirSync(src)) {
+                // 验证文件名安全性
+                if (file.includes('..') || file.includes('~')) {
+                    throw new Error(`不安全的文件名: ${file}`);
+                }
+                renderTemplate(path.resolve(src, file), path.resolve(dest, file));
+            }
             return;
         }
-        fs.mkdirSync(dest, { recursive: true });
-        for (const file of fs.readdirSync(src)) {
-            renderTemplate(path.resolve(src, file), path.resolve(dest, file));
+        // 处理文件
+        const filename = path.basename(src);
+        // 跳过 .ejs 文件（由生成器单独处理）
+        if (filename.endsWith(FILE_CONSTANTS.EJS_EXTENSION)) {
+            return;
         }
-        return;
-    }
-    const filename = path.basename(src);
-    // 跳过 .ejs 文件（由生成器单独处理）
-    if (filename.endsWith('.ejs')) {
-        return;
+        // 处理 package.json - 深度合并
+        if (filename === FILE_CONSTANTS.PACKAGE_JSON) {
+            renderPackageJson(src, dest);
+            return;
+        }
+        // 跳过 pnpm-workspace.yaml（不再使用）
+        if (filename === FILE_CONSTANTS.PNPM_WORKSPACE_YAML) {
+            return;
+        }
+        // 处理特殊文件名转换（如 _gitignore -> .gitignore）
+        const targetFilename = renameFile(filename);
+        const targetPath = path.resolve(path.dirname(dest), targetFilename);
+        // 普通文件直接复制（后面的会覆盖前面的）
+        fs.copyFileSync(src, targetPath);
     }
-    // 跳过 vite.config.data.ts 文件（用于数据驱动合并）
-    if (filename === 'vite.config.data.ts') {
-        return;
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        throw new Error(`渲染模板失败: ${src} -> ${dest}\n错误: ${errorMessage}`, {
+            cause: error,
+        });
     }
-    // 处理 package.json - 深度合并
-    if (filename === 'package.json') {
-        renderPackageJson(src, dest);
-        return;
+}
+/**
+ * 对 package.json 的依赖进行排序
+ * @param packageJson package.json 对象（会被修改）
+ */
+function sortPackageJsonDependencies(packageJson) {
+    if (packageJson.dependencies) {
+        packageJson.dependencies = sortDependencies(packageJson.dependencies);
     }
-    // 处理 pnpm-workspace.yaml - 深度合并
-    if (filename === 'pnpm-workspace.yaml') {
-        renderPnpmWorkspace(src, dest);
-        return;
+    if (packageJson.devDependencies) {
+        packageJson.devDependencies = sortDependencies(packageJson.devDependencies);
     }
-    // 处理特殊文件名转换（如 _gitignore -> .gitignore）
-    const targetFilename = renameFile(filename);
-    const targetPath = path.resolve(path.dirname(dest), targetFilename);
-    // 普通文件直接复制（后面的会覆盖前面的）
-    fs.copyFileSync(src, targetPath);
 }
 /**
  * 渲染 package.json - 深度合并
+ * @param src 源文件路径
+ * @param dest 目标文件路径
+ * @throws {Error} 如果文件读取失败、JSON 解析失败或写入失败
  */
 function renderPackageJson(src, dest) {
-    const newPackage = JSON.parse(fs.readFileSync(src, 'utf-8'));
-    if (fs.existsSync(dest)) {
-        const existingPackage = JSON.parse(fs.readFileSync(dest, 'utf-8'));
-        const merged = deepMerge(existingPackage, newPackage);
-        // 排序依赖
-        if (merged.dependencies) {
-            merged.dependencies = sortDependencies(merged.dependencies);
+    try {
+        const srcContent = fs.readFileSync(src, 'utf-8');
+        const newPackage = JSON.parse(srcContent);
+        if (fs.existsSync(dest)) {
+            const destContent = fs.readFileSync(dest, 'utf-8');
+            const existingPackage = JSON.parse(destContent);
+            const merged = deepMerge(existingPackage, newPackage);
+            sortPackageJsonDependencies(merged);
+            fs.writeFileSync(dest, `${JSON.stringify(merged, null, 2)}\n`);
         }
-        if (merged.devDependencies) {
-            merged.devDependencies = sortDependencies(merged.devDependencies);
+        else {
+            fs.mkdirSync(path.dirname(dest), { recursive: true });
+            fs.writeFileSync(dest, `${JSON.stringify(newPackage, null, 2)}\n`);
         }
-        fs.writeFileSync(dest, `${JSON.stringify(merged, null, 2)}\n`);
     }
-    else {
-        fs.mkdirSync(path.dirname(dest), { recursive: true });
-        fs.writeFileSync(dest, `${JSON.stringify(newPackage, null, 2)}\n`);
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        if (error instanceof SyntaxError) {
+            throw new TypeError(`package.json 解析失败: ${src}\n错误: ${errorMessage}`, { cause: error });
+        }
+        throw new Error(`处理 package.json 失败: ${src} -> ${dest}\n错误: ${errorMessage}`, { cause: error });
     }
 }
 /**
- * 渲染 pnpm-workspace.yaml - 深度合并
+ * 获取包管理器的默认版本号
+ * @param packageManager 包管理器类型
+ * @returns 包管理器版本字符串
  */
-function renderPnpmWorkspace(src, dest) {
-    const newWorkspace = yaml.parse(fs.readFileSync(src, 'utf-8')) || {};
-    if (fs.existsSync(dest)) {
-        const existingWorkspace = yaml.parse(fs.readFileSync(dest, 'utf-8')) || {};
-        const merged = deepMerge(existingWorkspace, newWorkspace);
-        // 排序 catalogs 中的依赖
-        if (merged.catalogs) {
-            for (const key of Object.keys(merged.catalogs)) {
-                merged.catalogs[key] = sortDependencies(merged.catalogs[key]);
-            }
+function getPackageManagerVersion(packageManager) {
+    const versions = {
+        pnpm: '10.8.0',
+        npm: '10.9.0',
+        yarn: '4.1.0',
+    };
+    return versions[packageManager] || versions.pnpm;
+}
+/**
+ * 更新 package.json 的元数据字段（name, description, author, packageManager）
+ * @param packageJsonPath package.json 文件路径
+ * @param projectName 项目名称
+ * @param description 项目描述
+ * @param author 作者
+ * @param packageManager 包管理器类型
+ * @throws {Error} 如果文件读取失败、JSON 解析失败或写入失败
+ */
+export function updatePackageJsonMetadata(packageJsonPath, projectName, description, author, packageManager) {
+    if (!fs.existsSync(packageJsonPath)) {
+        return;
+    }
+    try {
+        const content = fs.readFileSync(packageJsonPath, 'utf-8');
+        const packageJson = JSON.parse(content);
+        // 更新元数据字段
+        packageJson.name = projectName;
+        if (description) {
+            packageJson.description = description;
         }
-        fs.writeFileSync(dest, yaml.stringify(merged));
+        if (author) {
+            packageJson.author = author;
+        }
+        // 更新 packageManager 字段
+        packageJson.packageManager = `${packageManager}@${getPackageManagerVersion(packageManager)}`;
+        // 排序依赖
+        sortPackageJsonDependencies(packageJson);
+        fs.writeFileSync(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}\n`);
     }
-    else {
-        fs.mkdirSync(path.dirname(dest), { recursive: true });
-        fs.writeFileSync(dest, yaml.stringify(newWorkspace));
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        if (error instanceof SyntaxError) {
+            throw new TypeError(`package.json 解析失败: ${packageJsonPath}\n错误: ${errorMessage}`, { cause: error });
+        }
+        throw new Error(`更新 package.json 元数据失败: ${packageJsonPath}\n错误: ${errorMessage}`, { cause: error });
     }
 }
 /**
  * 重命名特殊文件
  * 某些文件不能以 . 开头存在于模板中，需要特殊处理
+ * @param name 原始文件名
+ * @returns 转换后的文件名
  */
 function renameFile(name) {
     // _开头的文件转换为.开头
@@ -99,4 +167,3 @@ function renameFile(name) {
     }
     return name;
 }
-//# sourceMappingURL=renderTemplate.js.map

package/dist/utils/sortDependencies.d.ts

@@ -1,6 +1,7 @@
 /**
  * 对依赖对象进行排序
- * 按字母顺序排列
+ * 按字母顺序排列，@ 开头的包放在前面
+ * @param dependencies 依赖对象
+ * @returns 排序后的依赖对象
  */
 export declare function sortDependencies(dependencies: Record<string, string>): Record<string, string>;
-//# sourceMappingURL=sortDependencies.d.ts.map

package/dist/utils/sortDependencies.js

@@ -1,6 +1,8 @@
 /**
  * 对依赖对象进行排序
- * 按字母顺序排列
+ * 按字母顺序排列，@ 开头的包放在前面
+ * @param dependencies 依赖对象
+ * @returns 排序后的依赖对象
  */
 export function sortDependencies(dependencies) {
     const sorted = {};
@@ -19,4 +21,3 @@ export function sortDependencies(dependencies) {
     }
     return sorted;
 }
-//# sourceMappingURL=sortDependencies.js.map

package/dist/utils/viteConfigRender.d.ts

@@ -1,19 +1,16 @@
 /**
  * Vite 配置渲染工具
- * 参考 create-vue 的数据驱动方式
- * 从各 feature 的 vite.config.data.ts 中读取配置
+ * 简化版：直接返回配置数据给 EJS 模板处理
  */
-import type { ProjectConfigType, ViteConfigData } from '../types';
+import type { ProjectConfigType } from '../types/index.ts';
 /**
- * 收集所有启用的 feature 的 vite.config.data
+ * 生成 vite.config.ts 的 EJS 模板数据
+ * @param config 项目配置对象
+ * @returns EJS 模板数据对象，包含框架类型、Sentry 配置、UI 库和路由模式
  */
-export declare function collectViteConfigData(config: ProjectConfigType): ViteConfigData[];
-/**
- * 合并 ViteConfigData 数组
- */
-export declare function mergeViteConfigData(dataList: ViteConfigData[]): ViteConfigData;
-/**
- * 生成 vite.config.ts 内容
- */
-export declare function renderViteConfig(config: ProjectConfigType): string;
-//# sourceMappingURL=viteConfigRender.d.ts.map
+export declare function getViteConfigEjsData(config: ProjectConfigType): {
+    framework: string;
+    sentry?: boolean;
+    uiLibrary?: string;
+    routeMode?: string;
+};

package/dist/utils/viteConfigRender.js

@@ -1,180 +1,17 @@
 /**
  * Vite 配置渲染工具
- * 参考 create-vue 的数据驱动方式
- * 从各 feature 的 vite.config.data.ts 中读取配置
+ * 简化版：直接返回配置数据给 EJS 模板处理
  */
-import fs from 'node:fs';
-import path from 'node:path';
-import { createJiti } from 'jiti';
-import { getTemplatesDir } from './file.js';
-/** Jiti 实例，用于动态加载 TypeScript 配置文件 */
-const jiti = createJiti(import.meta.url);
 /**
- * 从 feature 目录读取 vite.config.data.ts
+ * 生成 vite.config.ts 的 EJS 模板数据
+ * @param config 项目配置对象
+ * @returns EJS 模板数据对象，包含框架类型、Sentry 配置、UI 库和路由模式
  */
-function readViteConfigData(framework, feature) {
-    const templatesDir = getTemplatesDir();
-    const dataPath = path.join(templatesDir, framework, 'features', feature, 'vite.config.data.ts');
-    if (!fs.existsSync(dataPath)) {
-        return null;
-    }
-    try {
-        const module = jiti(dataPath);
-        return module.default;
-    }
-    catch (error) {
-        console.error(`Failed to load ${dataPath}:`, error);
-        return null;
-    }
-}
-/**
- * 收集所有启用的 feature 的 vite.config.data
- */
-export function collectViteConfigData(config) {
-    const framework = config.framework;
-    const dataList = [];
-    // 根据配置收集各 feature 的配置数据
-    const enabledFeatures = [];
-    if (config.sentry) {
-        enabledFeatures.push('sentry');
-    }
-    if (config.routeMode === 'file-system') {
-        enabledFeatures.push('pageRoutes');
-    }
-    if (framework === 'vue' && config.uiLibrary === 'element-plus') {
-        enabledFeatures.push('element-plus');
-    }
-    for (const feature of enabledFeatures) {
-        const data = readViteConfigData(framework, feature);
-        if (data) {
-            dataList.push(data);
-        }
-    }
-    return dataList;
-}
-/**
- * 合并 ViteConfigData 数组
- */
-export function mergeViteConfigData(dataList) {
-    const merged = {
-        imports: [],
-        options: {},
-        plugins: [],
+export function getViteConfigEjsData(config) {
+    return {
+        framework: config.framework,
+        sentry: config.sentry,
+        uiLibrary: config.uiLibrary,
+        routeMode: config.routeMode,
     };
-    for (const data of dataList) {
-        if (data.imports) {
-            merged.imports.push(...data.imports);
-        }
-        if (data.options) {
-            Object.assign(merged.options, data.options);
-        }
-        if (data.plugins) {
-            merged.plugins.push(...data.plugins);
-        }
-        if (data.css) {
-            merged.css = data.css;
-        }
-    }
-    return merged;
-}
-/**
- * 生成 vite.config.ts 内容
- */
-export function renderViteConfig(config) {
-    const dataList = collectViteConfigData(config);
-    const merged = mergeViteConfigData(dataList);
-    const lines = [];
-    lines.push('/**');
-    lines.push(' * Vite 配置文件');
-    lines.push(' * 基于 @moluoxixi/vite-config 的配置');
-    lines.push(' */');
-    lines.push('');
-    lines.push('import path from \'node:path\'');
-    lines.push('import process from \'node:process\'');
-    lines.push('import cssModuleGlobalRootPlugin from \'@moluoxixi/css-module-global-root-plugin\'');
-    lines.push('import { ViteConfig, wrapperEnv } from \'@moluoxixi/vite-config\'');
-    // 添加 feature 导入
-    if (merged.imports && merged.imports.length > 0) {
-        for (const imp of merged.imports) {
-            lines.push(imp);
-        }
-    }
-    lines.push('import { loadEnv } from \'vite\'');
-    lines.push('');
-    lines.push('export default ViteConfig(');
-    lines.push('  ({ mode }) => {');
-    lines.push('    const env = loadEnv(mode!, process.cwd())');
-    lines.push('    const viteEnv = wrapperEnv(env)');
-    lines.push('    const rootPath = path.resolve()');
-    lines.push('    const appCode = viteEnv.VITE_APP_CODE');
-    lines.push('    const appTitle = viteEnv.VITE_APP_TITLE');
-    lines.push('    const port = viteEnv.VITE_APP_PORT');
-    lines.push('    return {');
-    lines.push('      rootPath,');
-    lines.push('      appTitle,');
-    lines.push('      appCode,');
-    lines.push('      port,');
-    // 框架配置
-    if (config.framework === 'vue') {
-        lines.push('      vue: true,');
-    }
-    else {
-        lines.push('      react: true,');
-    }
-    lines.push('      autoComponent: true,');
-    // 添加 feature options
-    if (merged.options) {
-        for (const [key, value] of Object.entries(merged.options)) {
-            if (typeof value === 'boolean') {
-                lines.push(`      ${key}: ${value},`);
-            }
-            else if (typeof value === 'string') {
-                lines.push(`      ${key}: '${value}',`);
-            }
-            else {
-                lines.push(`      ${key}: ${JSON.stringify(value)},`);
-            }
-        }
-    }
-    lines.push('      viteConfig: {');
-    lines.push('        plugins: [');
-    // 添加 feature plugins
-    if (merged.plugins && merged.plugins.length > 0) {
-        for (const plugin of merged.plugins) {
-            lines.push(`          ${plugin},`);
-        }
-    }
-    lines.push('        ],');
-    lines.push('        server: {');
-    lines.push('          proxy: {');
-    lines.push('            \'/api\': {');
-    lines.push('              changeOrigin: true,');
-    lines.push('              target: \'http://localhost:3000\',');
-    lines.push('            },');
-    lines.push('          },');
-    lines.push('        },');
-    lines.push('        css: {');
-    lines.push('          postcss: {');
-    lines.push('            plugins: [');
-    lines.push('              cssModuleGlobalRootPlugin,');
-    lines.push('            ],');
-    lines.push('          },');
-    lines.push('          preprocessorOptions: {');
-    lines.push('            scss: {');
-    lines.push('              silenceDeprecations: [\'legacy-js-api\'],');
-    lines.push('              api: \'modern-compiler\',');
-    // 添加 CSS additionalData
-    if (merged.css?.additionalData) {
-        lines.push(`              ${merged.css.additionalData}`);
-    }
-    lines.push('            },');
-    lines.push('          },');
-    lines.push('        },');
-    lines.push('      },');
-    lines.push('    }');
-    lines.push('  },');
-    lines.push(')');
-    lines.push('');
-    return lines.join('\n');
 }
-//# sourceMappingURL=viteConfigRender.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moluoxixi/create-app",
-  "version": "2.0.4",
+  "version": "2.0.402",
   "type": "module",
   "description": "Create Vue/React projects with atomic layered architecture",
   "main": "dist/index.js",
@@ -49,6 +49,7 @@
     "yaml": "^2.6.0"
   },
   "devDependencies": {
+    "vite": "^6.2.4",
     "@commitlint/cli": "^19.8.0",
     "@commitlint/config-conventional": "^19.8.0",
     "@moluoxixi/eslint-config": "latest",
@@ -56,6 +57,7 @@
     "@types/fs-extra": "^11.0.4",
     "@types/inquirer": "^9.0.7",
     "@types/lodash-es": "^4.17.12",
+    "@vue-macros/volar": "^3.0.0-beta.15",
     "@types/node": "^22.14.0",
     "commitizen": "^4.3.1",
     "cz-customizable": "^7.4.0",
@@ -70,7 +72,7 @@
   },
   "scripts": {
     "dev": "tsx src/index.ts",
-    "build": "tsc",
+    "build": "tsc --build tsconfig.build.json",
     "test": "tsx src/test.ts --min",
     "test:all": "tsx src/test.ts",
     "type-check": "tsc --noEmit",

package/templates/common/base/.env

@@ -1,7 +1,7 @@
-# 环境变量配置
-# 所有环境通用
-
-VITE_APP_CODE=app
-VITE_APP_TITLE=My App
-VITE_APP_PORT=3000
-VITE_APP_VERSION=0.0.0
+# 环境变量配置
+# 所有环境通用
+
+VITE_APP_CODE=app
+VITE_APP_TITLE=My App
+VITE_APP_PORT=3000
+VITE_APP_VERSION=0.0.0

package/templates/common/base/.env.development

@@ -1,5 +1,5 @@
-# 开发环境变量配置
-
-VITE_APP_ENV=development
-VITE_API_BASE_URL=http://localhost:3000
-VITE_SENTRY=false
+# 开发环境变量配置
+
+VITE_APP_ENV=development
+VITE_API_BASE_URL=http://localhost:3000
+VITE_SENTRY=false

package/templates/common/base/.env.production

@@ -1,5 +1,5 @@
-# 生产环境变量配置
-
-VITE_APP_ENV=production
-VITE_API_BASE_URL=https://api.example.com
-VITE_SENTRY=true
+# 生产环境变量配置
+
+VITE_APP_ENV=production
+VITE_API_BASE_URL=https://api.example.com
+VITE_SENTRY=true

package/templates/common/base/package.json

@@ -21,36 +21,32 @@
     }
   },
   "dependencies": {
-    "@moluoxixi/ajax-package": "catalog:build",
-    "@moluoxixi/class-names": "catalog:build",
-    "crypto-js": "catalog:build",
-    "dayjs": "catalog:build",
-    "lodash-es": "catalog:build",
-    "radash": "catalog:build",
-    "uuid": "catalog:build"
+    "@moluoxixi/ajax-package": "latest",
+    "@moluoxixi/class-names": "latest",
+    "crypto-js": "^4.2.0",
+    "dayjs": "^1.11.13",
+    "lodash-es": "^4.17.21",
+    "radash": "^12.1.0",
+    "uuid": "^11.1.0"
   },
   "devDependencies": {
-    "@moluoxixi/ajax-package": "catalog:dev",
-    "@moluoxixi/css-module-global-root-plugin": "catalog:dev",
-    "@moluoxixi/vite-config": "catalog:dev",
-    "@types/crypto-js": "catalog:type",
-    "@types/lodash-es": "catalog:type",
-    "@types/node": "catalog:type",
-    "@types/uuid": "catalog:type",
-    "autoprefixer": "catalog:dev",
-    "compressing": "catalog:dev",
-    "dotenv": "catalog:dev",
-    "jiti": "catalog:dev",
-    "postcss": "catalog:dev",
-    "sass": "catalog:dev",
-    "sass-embedded": "catalog:dev",
-    "sass-loader": "catalog:dev",
-    "tailwindcss": "catalog:dev",
-    "tsx": "catalog:dev",
-    "typescript": "catalog:dev",
-    "vite": "catalog:dev"
+    "@types/crypto-js": "^4.2.2",
+    "@types/lodash-es": "^4.17.12",
+    "@types/node": "^22.14.0",
+    "@types/uuid": "^10.0.0",
+    "autoprefixer": "^10.4.20",
+    "compressing": "^1.10.1",
+    "dotenv": "^16.5.0",
+    "jiti": "^2.4.2",
+    "postcss": "^8.5.3",
+    "sass": "^1.87.0",
+    "sass-embedded": "^1.87.0",
+    "sass-loader": "^16.0.5",
+    "tailwindcss": "^4.0.0",
+    "tsx": "^4.20.5",
+    "typescript": "~5.8.0",
+    "vite": "^6.2.4"
   },
   "author": "",
   "license": "MIT"
 }
-