@farris/cli 2.2.5 → 2.3.0

package/lib/commands/generate/view.js

@@ -1,66 +1,66 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
-import { resolve, join } from 'node:path';
-import { findAppContext, normalizeGeneratorName, toPascalCase, toCamelCase, toReadableTitle } from './common.js';
-import { Transaction } from '../../common/transaction.js';
-import { sendJson, logInfo, logWarn, fail, setJsonMode, createSpinner } from '../../common/output.js';
-import { ExitCode } from '../../common/constant.js';
-export async function generateView(rawName, options = {}) {
-    const isJson = !!options.json;
-    setJsonMode(isJson);
-    if (!rawName) {
-        fail({
-            command: 'generate.view',
-            error: '必须指定 View 页面名称: farris-cli generate view <name>',
-            exitCode: ExitCode.GENERAL_ERROR
-        });
-    }
-    const normalizedName = normalizeGeneratorName(rawName);
-    if (!normalizedName.valid) {
-        fail({
-            command: 'generate.view',
-            error: `非法的 View 名称: ${normalizedName.error}`,
-            exitCode: ExitCode.GENERAL_ERROR
-        });
-    }
-    const name = normalizedName.name;
-    const pascalName = toPascalCase(name);
-    const camelName = toCamelCase(name);
-    const title = options.title || toReadableTitle(name);
-    const withRoute = !!options.withRoute;
-    const withProps = !!options.withProps;
-    const appContext = findAppContext(options.cwd || process.cwd());
-    const viewDir = join(appContext.srcDir, 'views', name);
-    const composablesDir = join(viewDir, 'composables');
-    const filesPlanned = [
-        join(viewDir, 'index.ts'),
-        join(viewDir, `${name}.component.tsx`),
-        join(composablesDir, `use-${name}.ts`)
-    ];
-    if (withProps) {
-        filesPlanned.push(join(viewDir, `${name}.props.ts`));
-    }
-    // 冲突检查
-    const conflicts = filesPlanned.filter((f) => existsSync(f));
-    if (conflicts.length > 0) {
-        fail({
-            command: 'generate.view',
-            error: `页面文件已存在，为保护已有代码已阻断生成: ${conflicts.map((c) => resolve(c)).join(', ')}`,
-            exitCode: ExitCode.TARGET_CONFLICT,
-            extra: { conflicts }
-        });
-    }
-    const transaction = new Transaction();
-    const spinner = createSpinner(`正在生成 View: ${name}...`);
-    spinner.start();
-    try {
-        mkdirSync(composablesDir, { recursive: true });
-        transaction.recordCreatedDir(viewDir);
-        transaction.recordCreatedDir(composablesDir);
-        const filesCreated = [];
-        const filesModified = [];
-        // 1. 生成 composable: src/views/<name>/composables/use-<name>.ts
-        const composablePath = join(composablesDir, `use-${name}.ts`);
-        transaction.prepareWrite(composablePath);
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
+import { resolve, join } from 'node:path';
+import { findAppContext, normalizeGeneratorName, toPascalCase, toCamelCase, toReadableTitle } from './common.js';
+import { Transaction } from '../../common/transaction.js';
+import { sendJson, logInfo, logWarn, fail, setJsonMode, createSpinner } from '../../common/output.js';
+import { ExitCode } from '../../common/constant.js';
+export async function generateView(rawName, options = {}) {
+    const isJson = !!options.json;
+    setJsonMode(isJson);
+    if (!rawName) {
+        fail({
+            command: 'generate.view',
+            error: '必须指定 View 页面名称: farris-cli generate view <name>',
+            exitCode: ExitCode.GENERAL_ERROR
+        });
+    }
+    const normalizedName = normalizeGeneratorName(rawName);
+    if (!normalizedName.valid) {
+        fail({
+            command: 'generate.view',
+            error: `非法的 View 名称: ${normalizedName.error}`,
+            exitCode: ExitCode.GENERAL_ERROR
+        });
+    }
+    const name = normalizedName.name;
+    const pascalName = toPascalCase(name);
+    const camelName = toCamelCase(name);
+    const title = options.title || toReadableTitle(name);
+    const withRoute = !!options.withRoute;
+    const withProps = !!options.withProps;
+    const appContext = findAppContext(options.cwd || process.cwd());
+    const viewDir = join(appContext.srcDir, 'views', name);
+    const composablesDir = join(viewDir, 'composables');
+    const filesPlanned = [
+        join(viewDir, 'index.ts'),
+        join(viewDir, `${name}.component.tsx`),
+        join(composablesDir, `use-${name}.ts`)
+    ];
+    if (withProps) {
+        filesPlanned.push(join(viewDir, `${name}.props.ts`));
+    }
+    // 冲突检查
+    const conflicts = filesPlanned.filter((f) => existsSync(f));
+    if (conflicts.length > 0) {
+        fail({
+            command: 'generate.view',
+            error: `页面文件已存在，为保护已有代码已阻断生成: ${conflicts.map((c) => resolve(c)).join(', ')}`,
+            exitCode: ExitCode.TARGET_CONFLICT,
+            extra: { conflicts }
+        });
+    }
+    const transaction = new Transaction();
+    const spinner = createSpinner(`正在生成 View: ${name}...`);
+    spinner.start();
+    try {
+        mkdirSync(composablesDir, { recursive: true });
+        transaction.recordCreatedDir(viewDir);
+        transaction.recordCreatedDir(composablesDir);
+        const filesCreated = [];
+        const filesModified = [];
+        // 1. 生成 composable: src/views/<name>/composables/use-<name>.ts
+        const composablePath = join(composablesDir, `use-${name}.ts`);
+        transaction.prepareWrite(composablePath);
         const composableContent = `export function use${pascalName}() {
   const title = ${JSON.stringify(title)};
 
@@ -68,13 +68,13 @@ export async function generateView(rawName, options = {}) {
     title
   };
 }
-`;
-        writeFileSync(composablePath, composableContent, 'utf-8');
-        filesCreated.push(composablePath);
-        // 2. 生成 props (若启用): src/views/<name>/<name>.props.ts
-        if (withProps) {
-            const propsPath = join(viewDir, `${name}.props.ts`);
-            transaction.prepareWrite(propsPath);
+`;
+        writeFileSync(composablePath, composableContent, 'utf-8');
+        filesCreated.push(composablePath);
+        // 2. 生成 props (若启用): src/views/<name>/<name>.props.ts
+        if (withProps) {
+            const propsPath = join(viewDir, `${name}.props.ts`);
+            transaction.prepareWrite(propsPath);
             const propsContent = `import type { ExtractPropTypes } from 'vue';
 
 export const ${camelName}ViewProps = {
@@ -82,13 +82,13 @@ export const ${camelName}ViewProps = {
 };
 
 export type ${pascalName}ViewProps = ExtractPropTypes<typeof ${camelName}ViewProps>;
-`;
-            writeFileSync(propsPath, propsContent, 'utf-8');
-            filesCreated.push(propsPath);
-        }
-        // 3. 生成 component: src/views/<name>/<name>.component.tsx
-        const componentPath = join(viewDir, `${name}.component.tsx`);
-        transaction.prepareWrite(componentPath);
+`;
+            writeFileSync(propsPath, propsContent, 'utf-8');
+            filesCreated.push(propsPath);
+        }
+        // 3. 生成 component: src/views/<name>/<name>.component.tsx
+        const componentPath = join(viewDir, `${name}.component.tsx`);
+        transaction.prepareWrite(componentPath);
         const componentContent = `import { defineComponent } from 'vue';
 import { use${pascalName} } from './composables/use-${name}';
 
@@ -104,95 +104,95 @@ export default defineComponent({
     );
   }
 });
-`;
-        writeFileSync(componentPath, componentContent, 'utf-8');
-        filesCreated.push(componentPath);
-        // 4. 生成 index: src/views/<name>/index.ts
-        const indexPath = join(viewDir, 'index.ts');
-        transaction.prepareWrite(indexPath);
-        let indexContent = `import ${pascalName}View from './${name}.component';\n\n`;
-        if (withProps) {
-            indexContent += `export { ${camelName}ViewProps, type ${pascalName}ViewProps } from './${name}.props';\n`;
-        }
-        indexContent += `export { ${pascalName}View };\nexport default ${pascalName}View;\n`;
-        writeFileSync(indexPath, indexContent, 'utf-8');
-        filesCreated.push(indexPath);
-        // 5. 若指定 --with-route，尝试在路由中幂等注册
-        let routeRegistered = false;
-        let routeNotice = '';
-        if (withRoute) {
-            const routerIndexPath = join(appContext.srcDir, 'router', 'index.ts');
-            const routesFilePath = join(appContext.srcDir, 'router', 'routes.ts');
-            const targetRouterFile = existsSync(routerIndexPath)
-                ? routerIndexPath
-                : existsSync(routesFilePath)
-                    ? routesFilePath
-                    : null;
-            if (targetRouterFile) {
-                transaction.prepareWrite(targetRouterFile);
-                let routerContent = readFileSync(targetRouterFile, 'utf-8');
-                // 检查是否已存在对应路由 name 或 path
-                const routeRegex = new RegExp(`name:\\s*['"]${pascalName}['"]|path:\\s*['"]/${name}['"]`);
-                if (!routeRegex.test(routerContent)) {
-                    // 查找 routes 数组位置并插入
-                    const routesArrayMatch = routerContent.match(/(routes\s*(?::\s*RouteRecordRaw\[\])?\s*=\s*\[)([\s\S]*?)(\];)/);
-                    if (routesArrayMatch) {
-                        const existingEntries = routesArrayMatch[2].trimEnd();
-                        const needsComma = existingEntries.trim().length > 0 && !existingEntries.endsWith(',');
-                        const separator = needsComma ? ',' : '';
-                        const newRouteEntry = `\n  {\n    path: '/${name}',\n    name: '${pascalName}',\n    component: () => import('../views/${name}')\n  },`;
-                        routerContent = routerContent.replace(routesArrayMatch[0], `${routesArrayMatch[1]}${existingEntries}${separator}${newRouteEntry}\n${routesArrayMatch[3]}`);
-                        writeFileSync(targetRouterFile, routerContent, 'utf-8');
-                        filesModified.push(targetRouterFile);
-                        routeRegistered = true;
-                    }
-                    else {
-                        routeNotice = `未在 ${targetRouterFile} 中识别出标准 routes 数组结构，请手动注册路由`;
-                    }
-                }
-                else {
-                    routeRegistered = true; // 已经存在，幂等跳过
-                }
-            }
-            else {
-                routeNotice = '未找到标准 src/router 路由文件，请手动注册路由配置';
-            }
-        }
-        transaction.commit();
-        spinner.succeed(`View ${name} 生成成功！`);
-        if (isJson) {
-            sendJson({
-                command: 'generate.view',
-                ok: true,
-                viewName: name,
-                pascalName,
-                title,
-                viewDir,
-                withRoute,
-                routeRegistered,
-                routeNotice: routeNotice || undefined,
-                filesCreated,
-                filesModified
-            });
-            return;
-        }
-        logInfo(`\n✨ 已成功生成页面: src/views/${name}/`);
-        filesCreated.forEach((f) => logInfo(`  + ${f}`));
-        if (filesModified.length > 0) {
-            filesModified.forEach((f) => logInfo(`  ~ ${f} (已自动注册路由)`));
-        }
-        if (routeNotice) {
-            logWarn(`  ! 路由提示: ${routeNotice}`);
-        }
-    }
-    catch (err) {
-        spinner.fail('生成 View 失败，正在回滚...');
-        transaction.rollback();
-        fail({
-            command: 'generate.view',
-            error: `生成 View 失败: ${err.message}`,
-            exitCode: ExitCode.GENERAL_ERROR
-        });
-    }
-}
+`;
+        writeFileSync(componentPath, componentContent, 'utf-8');
+        filesCreated.push(componentPath);
+        // 4. 生成 index: src/views/<name>/index.ts
+        const indexPath = join(viewDir, 'index.ts');
+        transaction.prepareWrite(indexPath);
+        let indexContent = `import ${pascalName}View from './${name}.component';\n\n`;
+        if (withProps) {
+            indexContent += `export { ${camelName}ViewProps, type ${pascalName}ViewProps } from './${name}.props';\n`;
+        }
+        indexContent += `export { ${pascalName}View };\nexport default ${pascalName}View;\n`;
+        writeFileSync(indexPath, indexContent, 'utf-8');
+        filesCreated.push(indexPath);
+        // 5. 若指定 --with-route，尝试在路由中幂等注册
+        let routeRegistered = false;
+        let routeNotice = '';
+        if (withRoute) {
+            const routerIndexPath = join(appContext.srcDir, 'router', 'index.ts');
+            const routesFilePath = join(appContext.srcDir, 'router', 'routes.ts');
+            const targetRouterFile = existsSync(routerIndexPath)
+                ? routerIndexPath
+                : existsSync(routesFilePath)
+                    ? routesFilePath
+                    : null;
+            if (targetRouterFile) {
+                transaction.prepareWrite(targetRouterFile);
+                let routerContent = readFileSync(targetRouterFile, 'utf-8');
+                // 检查是否已存在对应路由 name 或 path
+                const routeRegex = new RegExp(`name:\\s*['"]${pascalName}['"]|path:\\s*['"]/${name}['"]`);
+                if (!routeRegex.test(routerContent)) {
+                    // 查找 routes 数组位置并插入
+                    const routesArrayMatch = routerContent.match(/(routes\s*(?::\s*RouteRecordRaw\[\])?\s*=\s*\[)([\s\S]*?)(\];)/);
+                    if (routesArrayMatch) {
+                        const existingEntries = routesArrayMatch[2].trimEnd();
+                        const needsComma = existingEntries.trim().length > 0 && !existingEntries.endsWith(',');
+                        const separator = needsComma ? ',' : '';
+                        const newRouteEntry = `\n  {\n    path: '/${name}',\n    name: '${pascalName}',\n    component: () => import('../views/${name}')\n  },`;
+                        routerContent = routerContent.replace(routesArrayMatch[0], `${routesArrayMatch[1]}${existingEntries}${separator}${newRouteEntry}\n${routesArrayMatch[3]}`);
+                        writeFileSync(targetRouterFile, routerContent, 'utf-8');
+                        filesModified.push(targetRouterFile);
+                        routeRegistered = true;
+                    }
+                    else {
+                        routeNotice = `未在 ${targetRouterFile} 中识别出标准 routes 数组结构，请手动注册路由`;
+                    }
+                }
+                else {
+                    routeRegistered = true; // 已经存在，幂等跳过
+                }
+            }
+            else {
+                routeNotice = '未找到标准 src/router 路由文件，请手动注册路由配置';
+            }
+        }
+        transaction.commit();
+        spinner.succeed(`View ${name} 生成成功！`);
+        if (isJson) {
+            sendJson({
+                command: 'generate.view',
+                ok: true,
+                viewName: name,
+                pascalName,
+                title,
+                viewDir,
+                withRoute,
+                routeRegistered,
+                routeNotice: routeNotice || undefined,
+                filesCreated,
+                filesModified
+            });
+            return;
+        }
+        logInfo(`\n✨ 已成功生成页面: src/views/${name}/`);
+        filesCreated.forEach((f) => logInfo(`  + ${f}`));
+        if (filesModified.length > 0) {
+            filesModified.forEach((f) => logInfo(`  ~ ${f} (已自动注册路由)`));
+        }
+        if (routeNotice) {
+            logWarn(`  ! 路由提示: ${routeNotice}`);
+        }
+    }
+    catch (err) {
+        spinner.fail('生成 View 失败，正在回滚...');
+        transaction.rollback();
+        fail({
+            command: 'generate.view',
+            error: `生成 View 失败: ${err.message}`,
+            exitCode: ExitCode.GENERAL_ERROR
+        });
+    }
+}
 //# sourceMappingURL=view.js.map

package/lib/commands/generate/view.js.map

@@ -1 +1 @@
-{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../src/commands/generate/view.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../src/commands/generate/view.ts"],"names":[],"mappings":"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"}

package/lib/commands/preview-serve.js

@@ -1,17 +1,17 @@
-import { preview, mergeConfig } from 'vite';
-import { getViteConfig } from '../common/get-vite-config.js';
-export const previewServe = async (options) => {
-    const { port = 4137, host = true } = options;
-    const config = await getViteConfig();
-    const previewConfig = mergeConfig({
-        configFile: false,
-        preview: {
-            port,
-            host,
-            open: true
-        }
-    }, config);
-    const server = await preview(previewConfig);
-    server.printUrls();
-};
+import { preview, mergeConfig } from 'vite';
+import { getViteConfig } from '../common/get-vite-config.js';
+export const previewServe = async (options) => {
+    const { port = 4137, host = true } = options;
+    const config = await getViteConfig();
+    const previewConfig = mergeConfig({
+        configFile: false,
+        preview: {
+            port,
+            host,
+            open: true
+        }
+    }, config);
+    const server = await preview(previewConfig);
+    server.printUrls();
+};
 //# sourceMappingURL=preview-serve.js.map

package/lib/commands/workspace/add-app.js

@@ -1,181 +1,16 @@
-import { resolve, join, dirname } from 'node:path';
-import { existsSync, mkdirSync } from 'node:fs';
-import { ExitCode, getDirname } from '../../common/constant.js';
-import { renderTemplateDir } from '../../common/template-renderer.js';
-import { Transaction } from '../../common/transaction.js';
-import { verifyWorkspace } from '../../common/verifier.js';
-import { sendJson, logInfo, fail, setJsonMode, createSpinner } from '../../common/output.js';
-import { deriveAppDir, validatePackageName } from './create.js';
-/**
- * 向上查找 Workspace 根目录
- */
-export function findWorkspaceRoot(startDir = process.cwd()) {
-    let current = resolve(startDir);
-    while (true) {
-        if (existsSync(join(current, 'pnpm-workspace.yaml')) && existsSync(join(current, 'package.json'))) {
-            return current;
-        }
-        const parent = dirname(current);
-        if (parent === current) {
-            break;
-        }
-        current = parent;
-    }
-    return null;
-}
-export async function addAppToWorkspace(name, options = {}) {
-    const isJson = !!options.json;
-    setJsonMode(isJson);
-    if (!name) {
-        fail({
-            command: 'workspace.add-app',
-            error: '必须指定应用名称: farris-cli workspace add-app <name>',
-            exitCode: ExitCode.GENERAL_ERROR
-        });
-    }
-    if (!validatePackageName(name)) {
-        fail({
-            command: 'workspace.add-app',
-            error: `非法的应用包名: "${name}"`,
-            exitCode: ExitCode.GENERAL_ERROR
-        });
-    }
-    const wsRoot = findWorkspaceRoot(options.cwd || process.cwd());
-    if (!wsRoot) {
-        fail({
-            command: 'workspace.add-app',
-            error: '当前目录或上级目录未找到标准 pnpm workspace (缺少 pnpm-workspace.yaml)',
-            exitCode: ExitCode.GENERAL_ERROR
-        });
-    }
-    const appDir = deriveAppDir(name);
-    if (!appDir || !/^[a-z0-9-_]+$/.test(appDir)) {
-        fail({
-            command: 'workspace.add-app',
-            error: `无法从应用名 "${name}" 推导出合法的子目录名`,
-            exitCode: ExitCode.GENERAL_ERROR
-        });
-    }
-    const title = options.title || name;
-    const router = options.router ?? false;
-    const routerMode = options.routerMode || 'hash';
-    const format = options.format || 'es';
-    const style = options.style || 'css';
-    const appTargetDir = join(wsRoot, 'packages', appDir);
-    if (existsSync(appTargetDir)) {
-        fail({
-            command: 'workspace.add-app',
-            error: `子应用目录已存在: packages/${appDir}`,
-            exitCode: ExitCode.TARGET_CONFLICT
-        });
-    }
-    const templatesBase = resolve(getDirname(import.meta.url), '../../../templates/workspace');
-    const appTemplateDir = join(templatesBase, 'app');
-    const transaction = new Transaction();
-    const spinner = createSpinner(`正在向 Workspace 添加子应用 ${name}...`);
-    spinner.start();
-    try {
-        mkdirSync(appTargetDir, { recursive: true });
-        transaction.recordCreatedDir(appTargetDir);
-        const routerDependency = router ? ',\n    "vue-router": "catalog:"' : '';
-        const sassDevDependency = style === 'scss' ? ',\n    "sass": "catalog:"' : '';
-        let styleImport = '';
-        if (style === 'css') {
-            styleImport = "\nimport './styles/index.css';";
-        }
-        else if (style === 'scss') {
-            styleImport = "\nimport './styles/index.scss';";
-        }
-        const routerImport = router ? "\nimport router from './router';" : '';
-        const routerUse = router ? '\napp.use(router);' : '';
-        const i18nImport = '';
-        const i18nUse = '';
-        const appRouterImport = router ? "\nimport { RouterView } from 'vue-router';" : '';
-        const appTemplateBody = router
-            ? '        <RouterView />'
-            : `        <h1>${title}</h1>`;
-        const appVariables = {
-            appName: name,
-            title,
-            appDir,
-            base: '/',
-            routerMode: router ? routerMode : 'none',
-            format,
-            routerDependency,
-            sassDevDependency,
-            styleImport,
-            routerImport,
-            routerUse,
-            i18nImport,
-            i18nUse,
-            appRouterImport,
-            appTemplateBody,
-            routerHistoryFunction: routerMode === 'history' ? 'createWebHistory' : 'createWebHashHistory',
-            routerHistoryCall: routerMode === 'history'
-                ? 'createWebHistory(import.meta.env.BASE_URL)'
-                : 'createWebHashHistory()'
-        };
-        const appFilter = (relPath) => {
-            const normalized = relPath.replace(/\\/g, '/');
-            if (style === 'none' && normalized.startsWith('src/styles')) {
-                return false;
-            }
-            if (style === 'css' && (normalized === 'src/styles/index.scss' || normalized === 'src/styles/index.scss.tpl')) {
-                return false;
-            }
-            if (style === 'scss' && (normalized === 'src/styles/index.css' || normalized === 'src/styles/index.css.tpl')) {
-                return false;
-            }
-            if (!router && (normalized.startsWith('src/router') || normalized.startsWith('src/views'))) {
-                return false;
-            }
-            return true;
-        };
-        const appRender = renderTemplateDir({
-            sourceDir: appTemplateDir,
-            targetDir: appTargetDir,
-            variables: appVariables,
-            skipExisting: false,
-            filter: appFilter
-        });
-        if (appRender.unreplacedPlaceholders.length > 0) {
-            throw new Error(`子应用渲染出现未替换占位符: ${appRender.unreplacedPlaceholders.map((p) => `${p.file} (${p.placeholder})`).join(', ')}`);
-        }
-        appRender.filesCreated.forEach((f) => transaction.prepareWrite(f));
-        // 执行 verify
-        const verifyResult = verifyWorkspace(wsRoot);
-        if (!verifyResult.ok) {
-            throw new Error(`Workspace 校验失败: ${verifyResult.errors.join('; ')}`);
-        }
-        transaction.commit();
-        spinner.succeed(`子应用 ${name} 添加成功！`);
-        if (isJson) {
-            sendJson({
-                command: 'workspace.add-app',
-                ok: true,
-                workspaceRoot: wsRoot,
-                appName: name,
-                appDir,
-                title,
-                router,
-                format,
-                style,
-                filesCreated: appRender.filesCreated
-            });
-            return;
-        }
-        logInfo(`\n✨ 已在 packages/${appDir} 成功创建应用 ${name}`);
-        logInfo('\n启动该应用:');
-        logInfo(`  pnpm --filter "${name}" dev\n`);
-    }
-    catch (err) {
-        spinner.fail('添加子应用失败，正在回滚...');
-        transaction.rollback();
-        fail({
-            command: 'workspace.add-app',
-            error: `添加应用失败: ${err.message}`,
-            exitCode: ExitCode.GENERAL_ERROR
-        });
-    }
-}
+import { addProject } from '../add-project.js';
+import { findWorkspaceRoot } from '../../common/project-layout.js';
+import { logWarn } from '../../common/output.js';
+export { findWorkspaceRoot };
+/**
+ * [已废弃] 请改用 `farris-cli add-app`。保留本命令只为兼容既有脚本。
+ */
+export async function addAppToWorkspace(name, options = {}) {
+    logWarn('`farris-cli workspace add-app` 已废弃，请改用 `farris-cli add-app`。');
+    const { router, routerMode, ...rest } = options;
+    if (router !== undefined || routerMode !== undefined) {
+        logWarn('--router / --router-mode 已废弃：新 app 模板始终包含路由，参数被忽略。');
+    }
+    await addProject('app', name, rest);
+}
 //# sourceMappingURL=add-app.js.map

package/lib/commands/workspace/add-app.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-app.js","sourceRoot":"","sources":["../../../src/commands/workspace/add-app.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add-app.js","sourceRoot":"","sources":["../../../src/commands/workspace/add-app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA0B,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAE,iBAAiB,EAAE,CAAC;AAQ7B;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAAY,EAAE,UAAkC,EAAE;IACtF,OAAO,CAAC,8DAA8D,CAAC,CAAC;IAExE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IAChD,IAAI,MAAM,KAAK,SAAS,IAAI,UAAU,KAAK,SAAS,EAAE;QAClD,OAAO,CAAC,oDAAoD,CAAC,CAAC;KACjE;IAED,MAAM,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACxC,CAAC"}