@svton/cli 1.0.5 → 1.0.7

package/dist/index.mjs

@@ -13,12 +13,12 @@ import { Command } from "commander";
 import inquirer from "inquirer";
 import chalk2 from "chalk";
 import ora from "ora";
-import fs3 from "fs-extra";
-import path2 from "path";
+import fs4 from "fs-extra";
+import path3 from "path";
 import validateNpmPackageName from "validate-npm-package-name";
 
 // src/utils/template.ts
-import fs2 from "fs-extra";
+import fs3 from "fs-extra";
 
 // src/utils/logger.ts
 import chalk from "chalk";
@@ -43,22 +43,84 @@ var logger = {
 };
 
 // src/utils/copy-template.ts
+import fs2 from "fs-extra";
+import path2 from "path";
+
+// src/utils/github-template.ts
 import fs from "fs-extra";
 import path from "path";
+import { execSync } from "child_process";
+import os from "os";
+var GITHUB_REPO = "751848178/svton";
+var GITHUB_BRANCH = "main";
+async function downloadTemplateFromGitHub(options = {}) {
+  const repo = options.repo || GITHUB_REPO;
+  const branch = options.branch || GITHUB_BRANCH;
+  const tempDir = path.join(os.tmpdir(), `svton-template-${Date.now()}`);
+  const archiveUrl = `https://github.com/${repo}/archive/refs/heads/${branch}.tar.gz`;
+  logger.debug(`Downloading template from GitHub: ${archiveUrl}`);
+  try {
+    await fs.ensureDir(tempDir);
+    const tarFile = path.join(tempDir, "template.tar.gz");
+    execSync(`curl -sL "${archiveUrl}" -o "${tarFile}"`, {
+      stdio: "pipe"
+    });
+    execSync(`tar -xzf "${tarFile}" -C "${tempDir}"`, {
+      stdio: "pipe"
+    });
+    await fs.remove(tarFile);
+    const repoName = repo.split("/")[1];
+    const extractedDir = path.join(tempDir, `${repoName}-${branch}`);
+    const templateDir = path.join(extractedDir, "templates");
+    if (await fs.pathExists(templateDir)) {
+      logger.debug(`Template downloaded to: ${templateDir}`);
+      return templateDir;
+    }
+    throw new Error("Templates directory not found in downloaded repository");
+  } catch (error) {
+    await fs.remove(tempDir).catch(() => {
+    });
+    throw error;
+  }
+}
+async function cleanupTemplateDir(templateDir) {
+  try {
+    const tempRoot = path.dirname(path.dirname(templateDir));
+    if (tempRoot.includes("svton-template-")) {
+      await fs.remove(tempRoot);
+      logger.debug(`Cleaned up temp directory: ${tempRoot}`);
+    }
+  } catch (error) {
+    logger.debug(`Failed to cleanup temp directory: ${error}`);
+  }
+}
+
+// src/utils/copy-template.ts
 async function copyTemplateFiles(config) {
   const { template, projectPath } = config;
-  const cliPackageRoot = path.dirname(__dirname);
-  let templateDir = path.join(cliPackageRoot, "templates");
-  if (!await fs.pathExists(templateDir)) {
-    const frameworkRoot = path.dirname(path.dirname(cliPackageRoot));
-    templateDir = path.join(frameworkRoot, "templates");
+  let templateDir = null;
+  let needCleanup = false;
+  const cliPackageRoot = path2.dirname(__dirname);
+  const frameworkRoot = path2.dirname(path2.dirname(cliPackageRoot));
+  const localTemplateDir = path2.join(frameworkRoot, "templates");
+  if (await fs2.pathExists(localTemplateDir)) {
+    templateDir = localTemplateDir;
+    logger.debug(`Using local template directory: ${templateDir}`);
   }
-  logger.debug(`Copying template files from: ${templateDir}`);
-  if (!await fs.pathExists(templateDir)) {
-    logger.warn("Template directory not found, using built-in minimal templates");
-    await copyBuiltInTemplates(config);
-    return;
+  if (!templateDir) {
+    logger.info("Downloading templates from GitHub...");
+    try {
+      templateDir = await downloadTemplateFromGitHub();
+      needCleanup = true;
+      logger.info("Templates downloaded successfully");
+    } catch (error) {
+      logger.warn(`Failed to download templates from GitHub: ${error}`);
+      logger.warn("Using built-in minimal templates");
+      await copyBuiltInTemplates(config);
+      return;
+    }
   }
+  logger.debug(`Copying template files from: ${templateDir}`);
   const originalCwd = process.cwd();
   process.chdir(projectPath);
   try {
@@ -67,32 +129,35 @@ async function copyTemplateFiles(config) {
         await copyBackendTemplate(templateDir, config);
         await copyAdminTemplate(templateDir, config);
         await copyMobileTemplate(templateDir, config);
-        await copyTypesTemplate(templateDir, config);
+        await copySharedPackages(templateDir, config);
         break;
       case "backend-only":
         await copyBackendTemplate(templateDir, config);
-        await copyTypesTemplate(templateDir, config);
+        await copySharedPackages(templateDir, config);
         break;
       case "admin-only":
         await copyAdminTemplate(templateDir, config);
-        await copyTypesTemplate(templateDir, config);
+        await copySharedPackages(templateDir, config);
         break;
       case "mobile-only":
         await copyMobileTemplate(templateDir, config);
-        await copyTypesTemplate(templateDir, config);
+        await copySharedPackages(templateDir, config);
         break;
     }
   } finally {
     process.chdir(originalCwd);
+    if (needCleanup && templateDir) {
+      await cleanupTemplateDir(templateDir);
+    }
   }
 }
 async function copyBackendTemplate(sourceDir, config) {
-  const sourcePath = path.join(sourceDir, "apps/backend");
+  const sourcePath = path2.join(sourceDir, "apps/backend");
   const destPath = "apps/backend";
-  await fs.ensureDir(destPath);
-  await fs.copy(sourcePath, destPath, {
+  await fs2.ensureDir(destPath);
+  await fs2.copy(sourcePath, destPath, {
     filter: (src) => {
-      const relativePath = path.relative(sourcePath, src);
+      const relativePath = path2.relative(sourcePath, src);
       return !relativePath.includes("node_modules") && !relativePath.includes("dist") && !relativePath.includes(".env") && !relativePath.includes(".env.local");
     }
   });
@@ -100,12 +165,12 @@ async function copyBackendTemplate(sourceDir, config) {
   logger.debug("Backend template copied");
 }
 async function copyAdminTemplate(sourceDir, config) {
-  const sourcePath = path.join(sourceDir, "apps/admin");
+  const sourcePath = path2.join(sourceDir, "apps/admin");
   const destPath = "apps/admin";
-  await fs.ensureDir(destPath);
-  await fs.copy(sourcePath, destPath, {
+  await fs2.ensureDir(destPath);
+  await fs2.copy(sourcePath, destPath, {
     filter: (src) => {
-      const relativePath = path.relative(sourcePath, src);
+      const relativePath = path2.relative(sourcePath, src);
       return !relativePath.includes("node_modules") && !relativePath.includes(".next") && !relativePath.includes(".env.local");
     }
   });
@@ -113,44 +178,52 @@ async function copyAdminTemplate(sourceDir, config) {
   logger.debug("Admin template copied");
 }
 async function copyMobileTemplate(sourceDir, config) {
-  const sourcePath = path.join(sourceDir, "apps/mobile");
+  const sourcePath = path2.join(sourceDir, "apps/mobile");
   const destPath = "apps/mobile";
-  await fs.ensureDir(destPath);
-  await fs.copy(sourcePath, destPath, {
+  await fs2.ensureDir(destPath);
+  await fs2.copy(sourcePath, destPath, {
     filter: (src) => {
-      const relativePath = path.relative(sourcePath, src);
+      const relativePath = path2.relative(sourcePath, src);
       return !relativePath.includes("node_modules") && !relativePath.includes("dist");
     }
   });
   await replacePackageNames(destPath, config);
   logger.debug("Mobile template copied");
 }
-async function copyTypesTemplate(sourceDir, config) {
-  const sourcePath = path.join(sourceDir, "packages/types");
-  const destPath = "packages/types";
-  await fs.ensureDir(destPath);
-  await fs.copy(sourcePath, destPath, {
-    filter: (src) => {
-      const relativePath = path.relative(sourcePath, src);
-      return !relativePath.includes("node_modules") && !relativePath.includes("dist");
+async function copySharedPackages(sourceDir, config) {
+  const packagesSourceDir = path2.join(sourceDir, "packages");
+  const packagesDestDir = "packages";
+  await fs2.ensureDir(packagesDestDir);
+  const packages = await fs2.readdir(packagesSourceDir, { withFileTypes: true });
+  for (const pkg of packages) {
+    if (pkg.isDirectory()) {
+      const sourcePath = path2.join(packagesSourceDir, pkg.name);
+      const destPath = path2.join(packagesDestDir, pkg.name);
+      await fs2.ensureDir(destPath);
+      await fs2.copy(sourcePath, destPath, {
+        filter: (src) => {
+          const relativePath = path2.relative(sourcePath, src);
+          return !relativePath.includes("node_modules") && !relativePath.includes("dist");
+        }
+      });
+      await replacePackageNames(destPath, config);
+      logger.debug(`Package ${pkg.name} copied`);
     }
-  });
-  await replacePackageNames(destPath, config);
-  logger.debug("Types package copied");
+  }
 }
 async function replacePackageNames(directory, config) {
   const { projectName, orgName } = config;
   const filesToUpdate = await findFilesToUpdate(directory);
   for (const filePath of filesToUpdate) {
     try {
-      let content = await fs.readFile(filePath, "utf8");
-      content = content.replace(/\{\{ORG_NAME\}\}/g, orgName).replace(/\{\{PROJECT_NAME\}\}/g, projectName).replace(/@svton\//g, `${orgName}/`).replace(/community-next/g, projectName).replace(/community-helper/g, projectName).replace(/社区助手/g, projectName);
+      let content = await fs2.readFile(filePath, "utf8");
+      content = content.replace(/\{\{ORG_NAME\}\}/g, orgName).replace(/\{\{PROJECT_NAME\}\}/g, projectName);
       if (filePath.endsWith(".tpl")) {
         const newPath = filePath.replace(/\.tpl$/, "");
-        await fs.writeFile(newPath, content);
-        await fs.remove(filePath);
+        await fs2.writeFile(newPath, content);
+        await fs2.remove(filePath);
       } else {
-        await fs.writeFile(filePath, content);
+        await fs2.writeFile(filePath, content);
       }
     } catch (error) {
       logger.debug(`Failed to update file ${filePath}: ${error}`);
@@ -160,13 +233,13 @@ async function replacePackageNames(directory, config) {
 async function findFilesToUpdate(directory) {
   const files = [];
   const traverse = async (dir) => {
-    const entries = await fs.readdir(dir, { withFileTypes: true });
+    const entries = await fs2.readdir(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = path.join(dir, entry.name);
+      const fullPath = path2.join(dir, entry.name);
       if (entry.isDirectory()) {
         await traverse(fullPath);
       } else if (entry.isFile()) {
-        const ext = path.extname(entry.name);
+        const ext = path2.extname(entry.name);
         const shouldUpdate = [".json", ".ts", ".tsx", ".js", ".jsx", ".md", ".yaml", ".yml", ".env.example", ".tpl"].includes(ext) || entry.name.endsWith(".tpl");
         if (shouldUpdate) {
           files.push(fullPath);
@@ -193,7 +266,7 @@ async function copyBuiltInTemplates(config) {
 }
 async function createMinimalBackend(config) {
   const dir = "apps/backend";
-  await fs.ensureDir(dir);
+  await fs2.ensureDir(dir);
   const packageJson = {
     name: `${config.orgName}/backend`,
     version: "1.0.0",
@@ -218,11 +291,11 @@ async function createMinimalBackend(config) {
       "typescript": "^5.3.0"
     }
   };
-  await fs.writeJson(path.join(dir, "package.json"), packageJson, { spaces: 2 });
+  await fs2.writeJson(path2.join(dir, "package.json"), packageJson, { spaces: 2 });
 }
 async function createMinimalAdmin(config) {
   const dir = "apps/admin";
-  await fs.ensureDir(dir);
+  await fs2.ensureDir(dir);
   const packageJson = {
     name: `${config.orgName}/admin`,
     version: "1.0.0",
@@ -246,11 +319,11 @@ async function createMinimalAdmin(config) {
       "typescript": "^5.7.3"
     }
   };
-  await fs.writeJson(path.join(dir, "package.json"), packageJson, { spaces: 2 });
+  await fs2.writeJson(path2.join(dir, "package.json"), packageJson, { spaces: 2 });
 }
 async function createMinimalMobile(config) {
   const dir = "apps/mobile";
-  await fs.ensureDir(dir);
+  await fs2.ensureDir(dir);
   const packageJson = {
     name: `${config.orgName}/mobile`,
     version: "1.0.0",
@@ -275,13 +348,13 @@ async function createMinimalMobile(config) {
       "typescript": "^5.3.3"
     }
   };
-  await fs.writeJson(path.join(dir, "package.json"), packageJson, { spaces: 2 });
+  await fs2.writeJson(path2.join(dir, "package.json"), packageJson, { spaces: 2 });
 }
 async function createMinimalTypes(config) {
   const dir = "packages/types";
-  await fs.ensureDir(dir);
+  await fs2.ensureDir(dir);
   const packageJson = {
-    name: `${config.orgName}/types`,
+    name: `@${config.orgName}/types`,
     version: "1.0.0",
     description: "Shared type definitions",
     main: "./dist/index.js",
@@ -296,7 +369,7 @@ async function createMinimalTypes(config) {
       "typescript": "^5.3.3"
     }
   };
-  await fs.writeJson(path.join(dir, "package.json"), packageJson, { spaces: 2 });
+  await fs2.writeJson(path2.join(dir, "package.json"), packageJson, { spaces: 2 });
 }
 
 // src/utils/template.ts
@@ -339,12 +412,12 @@ async function createRootFiles(config) {
       pnpm: ">=8.0.0"
     }
   };
-  await fs2.writeJson("package.json", packageJson, { spaces: 2 });
+  await fs3.writeJson("package.json", packageJson, { spaces: 2 });
   const workspaceConfig = `packages:
   - 'apps/*'
   - 'packages/*'
 `;
-  await fs2.writeFile("pnpm-workspace.yaml", workspaceConfig);
+  await fs3.writeFile("pnpm-workspace.yaml", workspaceConfig);
   const turboConfig = {
     "$schema": "https://turbo.build/schema.json",
     pipeline: {
@@ -368,7 +441,7 @@ async function createRootFiles(config) {
       }
     }
   };
-  await fs2.writeJson("turbo.json", turboConfig, { spaces: 2 });
+  await fs3.writeJson("turbo.json", turboConfig, { spaces: 2 });
   const gitignore = `# Dependencies
 node_modules/
 .pnpm-store/
@@ -406,11 +479,11 @@ coverage/
 # Misc
 *.tsbuildinfo
 `;
-  await fs2.writeFile(".gitignore", gitignore);
+  await fs3.writeFile(".gitignore", gitignore);
   const npmrc = `auto-install-peers=true
 strict-peer-dependencies=false
 `;
-  await fs2.writeFile(".npmrc", npmrc);
+  await fs3.writeFile(".npmrc", npmrc);
   const dockerCompose = `version: '3.8'
 
 services:
@@ -442,9 +515,9 @@ volumes:
   mysql_data:
   redis_data:
 `;
-  await fs2.writeFile("docker-compose.yml", dockerCompose);
+  await fs3.writeFile("docker-compose.yml", dockerCompose);
   const readme = await generateReadme(config);
-  await fs2.writeFile("README.md", readme);
+  await fs3.writeFile("README.md", readme);
 }
 async function generateReadme(config) {
   const { projectName, orgName, template } = config;
@@ -529,12 +602,12 @@ Generated with \`create-svton-app\`
 }
 
 // src/utils/install.ts
-import { execSync } from "child_process";
+import { execSync as execSync2 } from "child_process";
 async function installDependencies(packageManager) {
   try {
     const command = getInstallCommand(packageManager);
     logger.debug(`Running: ${command}`);
-    execSync(command, {
+    execSync2(command, {
       stdio: "inherit",
       cwd: process.cwd()
     });
@@ -556,18 +629,18 @@ function getInstallCommand(packageManager) {
 }
 
 // src/utils/git.ts
-import { execSync as execSync2 } from "child_process";
+import { execSync as execSync3 } from "child_process";
 async function initGit(projectName) {
   try {
     try {
-      execSync2("git status", { stdio: "ignore" });
+      execSync3("git status", { stdio: "ignore" });
       logger.debug("Git repository already exists, skipping initialization");
       return;
     } catch {
     }
-    execSync2("git init", { stdio: "ignore" });
-    execSync2("git add .", { stdio: "ignore" });
-    execSync2(`git commit -m "feat: initialize ${projectName} project"`, {
+    execSync3("git init", { stdio: "ignore" });
+    execSync3("git add .", { stdio: "ignore" });
+    execSync3(`git commit -m "feat: initialize ${projectName} project"`, {
       stdio: "ignore"
     });
     logger.debug("Git repository initialized successfully");
@@ -588,8 +661,8 @@ async function createProject(projectName, options = {}) {
       }
       process.exit(1);
     }
-    const projectPath = path2.resolve(process.cwd(), projectName);
-    if (await fs3.pathExists(projectPath)) {
+    const projectPath = path3.resolve(process.cwd(), projectName);
+    if (await fs4.pathExists(projectPath)) {
       logger.error(`Directory ${projectName} already exists!`);
       process.exit(1);
     }
@@ -707,7 +780,7 @@ async function createProject(projectName, options = {}) {
 async function createProjectFromTemplate(config) {
   const spinner = ora("Creating project...").start();
   try {
-    await fs3.ensureDir(config.projectPath);
+    await fs4.ensureDir(config.projectPath);
     process.chdir(config.projectPath);
     spinner.text = "Generating project files...";
     await generateFromTemplate(config);
@@ -727,7 +800,7 @@ async function createProjectFromTemplate(config) {
 }
 
 // package.json
-var version = "1.0.5";
+var version = "1.0.7";
 
 // src/index.ts
 async function cli() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@svton/cli",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Svton CLI - Create full-stack applications with NestJS, Next.js, and Taro",
   "keywords": [
     "cli",
@@ -30,7 +30,6 @@
   "files": [
     "dist",
     "bin",
-    "templates",
     "README.md",
     "LICENSE"
   ],

package/templates/apps/admin/next-env.d.ts

@@ -1,2 +0,0 @@
-/// <reference types="next" />
-/// <reference types="next/image-types/global" />

package/templates/apps/admin/next.config.js

@@ -1,15 +0,0 @@
-/** @type {import('next').NextConfig} */
-const nextConfig = {
-  reactStrictMode: true,
-  transpilePackages: ['@svton/hooks'],
-  images: {
-    remotePatterns: [
-      {
-        protocol: 'https',
-        hostname: '**',
-      },
-    ],
-  },
-};
-
-module.exports = nextConfig;

package/templates/apps/admin/package.json.tpl

@@ -1,54 +0,0 @@
-{
-  "name": "{{ORG_NAME}}/admin",
-  "version": "1.0.0",
-  "description": "{{PROJECT_NAME}} 管理后台",
-  "scripts": {
-    "dev": "next dev -p 3001",
-    "build": "next build",
-    "start": "next start -p 3001",
-    "lint": "next lint",
-    "type-check": "tsc --noEmit",
-    "clean": "rm -rf .next"
-  },
-  "dependencies": {
-    "@hookform/resolvers": "^3.3.3",
-    "@radix-ui/react-avatar": "^1.0.4",
-    "@radix-ui/react-dialog": "^1.0.5",
-    "@radix-ui/react-dropdown-menu": "^2.0.6",
-    "@radix-ui/react-label": "^2.0.2",
-    "@radix-ui/react-select": "^2.0.0",
-    "@radix-ui/react-separator": "^1.0.3",
-    "@radix-ui/react-slot": "^1.0.2",
-    "@radix-ui/react-switch": "^1.2.6",
-    "@radix-ui/react-tabs": "^1.0.4",
-    "@radix-ui/react-toast": "^1.1.5",
-    "@svton/api-client": "^1.0.0",
-    "@svton/hooks": "^1.0.0",
-    "@svton/types": "^1.0.0",
-    "axios": "^1.7.9",
-    "class-variance-authority": "^0.7.1",
-    "clsx": "^2.1.1",
-    "dayjs": "^1.11.13",
-    "lucide-react": "^0.462.0",
-    "next": "^15.0.0",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "react-hook-form": "^7.49.0",
-    "swr": "^2.2.5",
-    "tailwind-merge": "^3.0.0",
-    "zod": "^3.22.4",
-    "zustand": "^5.0.0"
-  },
-  "devDependencies": {
-    "@types/node": "^22.0.0",
-    "@types/react": "^19.0.0",
-    "@types/react-dom": "^19.0.0",
-    "autoprefixer": "^10.4.22",
-    "eslint": "^9.0.0",
-    "eslint-config-next": "^15.0.0",
-    "postcss": "^8.5.0",
-    "tailwindcss": "^3.4.0",
-    "tailwindcss-animate": "^1.0.7",
-    "typescript": "^5.7.0"
-  }
-}

package/templates/apps/admin/postcss.config.js

@@ -1,6 +0,0 @@
-module.exports = {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-};

package/templates/apps/admin/src/app/globals.css

@@ -1,37 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-@layer base {
-  :root {
-    --background: 0 0% 100%;
-    --foreground: 222.2 84% 4.9%;
-    --card: 0 0% 100%;
-    --card-foreground: 222.2 84% 4.9%;
-    --popover: 0 0% 100%;
-    --popover-foreground: 222.2 84% 4.9%;
-    --primary: 222.2 47.4% 11.2%;
-    --primary-foreground: 210 40% 98%;
-    --secondary: 210 40% 96.1%;
-    --secondary-foreground: 222.2 47.4% 11.2%;
-    --muted: 210 40% 96.1%;
-    --muted-foreground: 215.4 16.3% 46.9%;
-    --accent: 210 40% 96.1%;
-    --accent-foreground: 222.2 47.4% 11.2%;
-    --destructive: 0 84.2% 60.2%;
-    --destructive-foreground: 210 40% 98%;
-    --border: 214.3 31.8% 91.4%;
-    --input: 214.3 31.8% 91.4%;
-    --ring: 222.2 84% 4.9%;
-    --radius: 0.5rem;
-  }
-}
-
-@layer base {
-  * {
-    @apply border-border;
-  }
-  body {
-    @apply bg-background text-foreground;
-  }
-}

package/templates/apps/admin/src/app/layout.tsx

@@ -1,19 +0,0 @@
-import type { Metadata } from 'next';
-import './globals.css';
-
-export const metadata: Metadata = {
-  title: '管理后台',
-  description: '项目管理后台',
-};
-
-export default function RootLayout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <html lang="zh-CN">
-      <body>{children}</body>
-    </html>
-  );
-}