create-szyy-app 1.0.4 → 1.0.5

package/README.md

@@ -49,7 +49,7 @@ pnpm build:prod   # 生产构建
 
 ## 版本锁定
 
-版本配置默认从模板仓 **`create-app` 分支** 的 `versions.json` 远程拉取；拉取失败时使用 npm 包内置配置兜底。更新模板 tag 或依赖版本时，只需修改模板仓 `create-app` 分支上的 `versions.json`，**无需重新发布 CLI**。
+版本配置默认从模板仓 **`create-app` 分支** 拉取 `versions.json`（内网 Git 走 `git clone`，公网 GitLab 等先尝试 Raw URL）；拉取失败时使用 npm 包内置配置兜底。更新模板 tag 或依赖版本时，只需修改模板仓 `create-app` 分支上的 `versions.json`，**无需重新发布 CLI**。
 
 生成项目的 `package.json` 会写死精确版本号（无 `^`）。
 
@@ -83,12 +83,12 @@ pnpm publish:pkg --tag=beta
 
 ## 故障排查
 
-| 问题             | 处理                                                                                |
-| ---------------- | ----------------------------------------------------------------------------------- |
-| degit 拉取失败   | 检查内网 Git 连通性，或设置 `SZYY_TEMPLATE_PATH` 使用本地模板                       |
-| 占位符残留报错   | 确认模板 tag 与远程/本地 `versions.json` 中 `template` 版本一致                     |
-| 版本配置拉取失败 | 检查内网 Git 连通性，CLI 会自动回退内置配置；可用 `SZYY_VERSIONS_PATH` 指定本地配置 |
-| 联调端口冲突     | 创建时指定 `--port`，或修改生成项目 `.env.micro`                                    |
+| 问题             | 处理                                                                                       |
+| ---------------- | ------------------------------------------------------------------------------------------ |
+| degit 拉取失败   | 检查内网 Git 连通性，或设置 `SZYY_TEMPLATE_PATH` 使用本地模板                              |
+| 占位符残留报错   | 确认模板 tag 与远程/本地 `versions.json` 中 `template` 版本一致                            |
+| 版本配置拉取失败 | 确认模板仓 `create-app` 分支存在 `versions.json` 且本机 Git 已登录；CLI 会自动回退内置配置 |
+| 联调端口冲突     | 创建时指定 `--port`，或修改生成项目 `.env.micro`                                           |
 
 ## 延伸阅读
 

package/dist/index.js

@@ -355,8 +355,37 @@ function cleanupGeneratedGitignore(targetDir) {
 import fs2 from "fs";
 import path3 from "path";
 import os from "os";
-import { spawnSync } from "child_process";
 import degit from "degit";
+
+// src/git.ts
+import { spawnSync } from "child_process";
+var PUBLIC_GIT_HOSTS = /* @__PURE__ */ new Set(["github.com", "gitlab.com", "bitbucket.org", "git.sr.ht"]);
+function shouldUseGitCloneDirectly(source) {
+  if (source.startsWith("git@") || source.startsWith("file://")) return true;
+  if (source.startsWith(".") || source.startsWith("/") || /^[A-Za-z]:[\\/]/.test(source)) return true;
+  try {
+    const url = new URL(source);
+    return !PUBLIC_GIT_HOSTS.has(url.hostname.toLowerCase());
+  } catch {
+    return true;
+  }
+}
+function shallowCloneBranch(repo, branch, targetDir) {
+  const result = spawnSync("git", ["clone", "--depth", "1", "--branch", branch, repo, targetDir], {
+    encoding: "utf8"
+  });
+  if (result.status === 0) {
+    return;
+  }
+  const errorOutput = result.stderr?.trim() || result.stdout?.trim() || "git clone \u6267\u884C\u5931\u8D25";
+  throw new Error(`Git \u62C9\u53D6\u5931\u8D25: ${errorOutput}`);
+}
+function shouldFallbackToGitClone(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  return message.includes("degit supports GitHub, GitLab, Sourcehut and BitBucket");
+}
+
+// src/template.ts
 async function fetchTemplate(targetDir, versions) {
   const localPath = process.env.SZYY_TEMPLATE_PATH;
   if (localPath) {
@@ -385,34 +414,15 @@ async function fetchTemplate(targetDir, versions) {
     cloneWithGit(gitBase, versions.template, targetDir);
   }
 }
-var DEGIT_HOSTS = /* @__PURE__ */ new Set(["github.com", "gitlab.com", "bitbucket.org", "git.sr.ht"]);
-function shouldUseGitCloneDirectly(source) {
-  if (source.startsWith("git@") || source.startsWith("file://")) return true;
-  if (source.startsWith(".") || source.startsWith("/") || /^[A-Za-z]:[\\/]/.test(source)) return true;
-  try {
-    const url = new URL(source);
-    return !DEGIT_HOSTS.has(url.hostname.toLowerCase());
-  } catch {
-    return true;
-  }
-}
-function shouldFallbackToGitClone(error) {
-  const message = error instanceof Error ? error.message : String(error);
-  return message.includes("degit supports GitHub, GitLab, Sourcehut and BitBucket");
-}
 function cloneWithGit(repo, ref, targetDir) {
   const tempDir = fs2.mkdtempSync(path3.join(os.tmpdir(), "create-szyy-app-"));
   try {
     const cloneDir = path3.join(tempDir, "template");
-    const result = spawnSync("git", ["clone", "--depth", "1", "--branch", ref, repo, cloneDir], {
-      encoding: "utf8"
-    });
-    if (result.status === 0) {
-      copyRecursive(cloneDir, targetDir);
-      return;
-    }
-    const errorOutput = result.stderr?.trim() || result.stdout?.trim() || "git clone \u6267\u884C\u5931\u8D25";
-    throw new Error(`\u6A21\u677F\u62C9\u53D6\u5931\u8D25: ${errorOutput}`);
+    shallowCloneBranch(repo, ref, cloneDir);
+    copyRecursive(cloneDir, targetDir);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw new Error(`\u6A21\u677F\u62C9\u53D6\u5931\u8D25: ${message}`);
   } finally {
     fs2.rmSync(tempDir, { recursive: true, force: true });
   }
@@ -453,6 +463,7 @@ function removeExcludedTemplateEntries(targetDir) {
 
 // src/versions.ts
 import fs3 from "fs";
+import os2 from "os";
 import path4 from "path";
 import { fileURLToPath } from "url";
 var __filename2 = fileURLToPath(import.meta.url);
@@ -496,6 +507,9 @@ function getRepoBase(bundled) {
 function getDefaultRemoteVersionsUrl(bundled) {
   return `${getRepoBase(bundled)}/-/raw/${CONFIG_BRANCH}/versions.json`;
 }
+function getGitVersionsLabel(repoBase) {
+  return `${repoBase}#${CONFIG_BRANCH}:versions.json`;
+}
 async function fetchVersionsFromUrl(url) {
   const response = await fetch(url, {
     headers: { Accept: "application/json" },
@@ -506,6 +520,53 @@ async function fetchVersionsFromUrl(url) {
   }
   return validateVersionsConfig(await response.json());
 }
+function fetchVersionsFromGit(repo, branch) {
+  const tempDir = fs3.mkdtempSync(path4.join(os2.tmpdir(), "create-szyy-app-versions-"));
+  try {
+    const cloneDir = path4.join(tempDir, "repo");
+    shallowCloneBranch(repo, branch, cloneDir);
+    const versionsPath = path4.join(cloneDir, "versions.json");
+    if (!fs3.existsSync(versionsPath)) {
+      throw new Error(`\u6A21\u677F\u4ED3 ${branch} \u5206\u652F\u7F3A\u5C11 versions.json`);
+    }
+    return validateVersionsConfig(JSON.parse(fs3.readFileSync(versionsPath, "utf-8")));
+  } finally {
+    fs3.rmSync(tempDir, { recursive: true, force: true });
+  }
+}
+async function fetchRemoteVersions(bundled) {
+  const repoBase = getRepoBase(bundled);
+  const remoteUrl = process.env.SZYY_VERSIONS_URL || getDefaultRemoteVersionsUrl(bundled);
+  if (process.env.SZYY_VERSIONS_URL) {
+    return {
+      config: await fetchVersionsFromUrl(remoteUrl),
+      remoteUrl
+    };
+  }
+  if (shouldUseGitCloneDirectly(repoBase)) {
+    return {
+      config: fetchVersionsFromGit(repoBase, CONFIG_BRANCH),
+      remoteUrl: getGitVersionsLabel(repoBase)
+    };
+  }
+  try {
+    return {
+      config: await fetchVersionsFromUrl(remoteUrl),
+      remoteUrl
+    };
+  } catch (httpError) {
+    try {
+      return {
+        config: fetchVersionsFromGit(repoBase, CONFIG_BRANCH),
+        remoteUrl: getGitVersionsLabel(repoBase)
+      };
+    } catch (gitError) {
+      const httpMsg = httpError instanceof Error ? httpError.message : String(httpError);
+      const gitMsg = gitError instanceof Error ? gitError.message : String(gitError);
+      throw new Error(`${httpMsg}; Git \u56DE\u9000\u4E5F\u5931\u8D25: ${gitMsg}`);
+    }
+  }
+}
 function readVersionsFromPath(filePath) {
   const resolved = path4.resolve(filePath);
   if (!fs3.existsSync(resolved)) {
@@ -528,15 +589,15 @@ async function resolveVersions(options) {
       source: "path"
     };
   }
-  const remoteUrl = process.env.SZYY_VERSIONS_URL || getDefaultRemoteVersionsUrl(bundled);
   try {
-    const remote = await fetchVersionsFromUrl(remoteUrl);
+    const { config: remote, remoteUrl } = await fetchRemoteVersions(bundled);
     return {
       config: applyOverrides(mergeVersions(bundled, remote), options),
       source: "remote",
       remoteUrl
     };
   } catch (error) {
+    const remoteUrl = process.env.SZYY_VERSIONS_URL || getDefaultRemoteVersionsUrl(bundled);
     const fallbackReason = error instanceof Error ? error.message : String(error);
     return {
       config: applyOverrides(bundled, options),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-szyy-app",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "脚手架：一键创建微前端子应用",
   "type": "module",
   "bin": {