create-weapp-vite 2.0.59 → 2.0.60

package/dist/cli.js

@@ -1,4 +1,4 @@
-import { n as TemplateName, t as createProject } from "./src-D1-gOdfL.js";
+import { n as TemplateName, t as createProject } from "./src-CXCuh90o.js";
 import logger from "@weapp-core/logger";
 import fs from "fs-extra";
 import path from "node:path";

package/dist/index.js

@@ -1,2 +1,2 @@
-import { n as TemplateName, t as createProject } from "./src-D1-gOdfL.js";
+import { n as TemplateName, t as createProject } from "./src-CXCuh90o.js";
 export { TemplateName, createProject };

package/dist/{src-D1-gOdfL.js → src-CXCuh90o.js}

@@ -4,10 +4,10 @@ import fs from "fs-extra";
 import path from "pathe";
 import https from "node:https";
 //#region ../weapp-vite/package.json
-var version$1 = "6.11.4";
+var version$1 = "6.11.5";
 //#endregion
 //#region ../wevu/package.json
-var version = "6.11.4";
+var version = "6.11.5";
 //#endregion
 //#region src/enums.ts
 let TemplateName = /* @__PURE__ */ function(TemplateName) {
@@ -72,8 +72,8 @@ const TEMPLATE_CATALOG = {
 	sass: "^1.98.0",
 	tailwindcss: "^4.2.2",
 	tslib: "^2.8.1",
-	typescript: "^5.9.3",
-	vite: "8.0.0",
+	typescript: "^6.0.2",
+	vite: "8.0.2",
 	vue: "^3.5.30",
 	zod: "^4.3.6"
 };
@@ -82,7 +82,7 @@ const TEMPLATE_NAMED_CATALOG = {
 	"weapp-tailwindcss-fixed": { "weapp-tailwindcss": "4.10.3" },
 	latest: {
 		"miniprogram-api-typings": "^5.1.2",
-		typescript: "latest"
+		typescript: "^6.0.2"
 	},
 	tailwind3: { tailwindcss: "3.4.19" },
 	tailwind4: { tailwindcss: "^4.2.2" }
@@ -169,9 +169,9 @@ dist-web
 dist/web
 vite.config.ts.timestamp-*.mjs
 .weapp-vite/`;
-const CRLF_RE = /\r\n/g;
+const CRLF_RE$1 = /\r\n/g;
 function normalizeLineEndings(value) {
-	return value.replace(CRLF_RE, "\n");
+	return value.replace(CRLF_RE$1, "\n");
 }
 function trimTrailingBlankLines(lines) {
 	let end = lines.length;
@@ -266,9 +266,61 @@ async function updateGitIgnore(options) {
 //#endregion
 //#region src/createProject.ts
 const DIGIT_RE = /\d/;
+const CRLF_RE = /\r\n/g;
 const moduleDir = path.dirname(fileURLToPath(import.meta.url));
+const TEMPLATE_DIR_MAP = {
+	[TemplateName.default]: "weapp-vite-template",
+	[TemplateName.lib]: "weapp-vite-lib-template",
+	[TemplateName.wevu]: "weapp-vite-wevu-template",
+	[TemplateName.wevuTdesign]: "weapp-vite-wevu-tailwindcss-tdesign-template",
+	[TemplateName.tailwindcss]: "weapp-vite-tailwindcss-template",
+	[TemplateName.tdesign]: "weapp-vite-tailwindcss-tdesign-template",
+	[TemplateName.vant]: "weapp-vite-tailwindcss-vant-template"
+};
 const templateCatalogMap = { ...TEMPLATE_CATALOG };
 const templateNamedCatalogMap = Object.fromEntries(Object.entries(TEMPLATE_NAMED_CATALOG).map(([name, deps]) => [name, { ...deps }]));
+function resolveWorkspaceTemplateDir(templateName) {
+	const templateDirName = TEMPLATE_DIR_MAP[templateName];
+	return templateDirName ? path.resolve(moduleDir, "../../../templates", templateDirName) : path.resolve(moduleDir, "../../../templates", templateName);
+}
+async function resolveTemplateDirs(templateName) {
+	const packagedTemplateDir = path.resolve(moduleDir, "../templates", templateName);
+	const workspaceTemplateDir = resolveWorkspaceTemplateDir(templateName);
+	return {
+		packagedTemplateDir,
+		workspaceTemplateDir,
+		preferredTemplateDir: await fs.pathExists(packagedTemplateDir) ? packagedTemplateDir : workspaceTemplateDir
+	};
+}
+function shouldSkipTemplateFile(filePath) {
+	return filePath.includes("node_modules") || filePath.includes(`${path.sep}.weapp-vite${path.sep}`) || filePath.includes("vite.config.ts.timestamp") || filePath.includes(`${path.sep}dist${path.sep}`) || filePath.endsWith(`${path.sep}CHANGELOG.md`) || filePath.includes(`${path.sep}.turbo${path.sep}`) || filePath.endsWith(`${path.sep}.DS_Store`);
+}
+function normalizeLines(value) {
+	return value.replace(CRLF_RE, "\n").split("\n");
+}
+function mergeGitignoreSource(existing, template) {
+	const merged = normalizeLines(existing);
+	const seen = new Set(merged);
+	for (const line of normalizeLines(template)) {
+		if (seen.has(line)) continue;
+		merged.push(line);
+		seen.add(line);
+	}
+	while (merged.length > 0 && merged.at(-1) === "") merged.pop();
+	return `${merged.join("\n")}\n`;
+}
+async function copyTemplateDir(sourceDir, fallbackDir, targetDir) {
+	const copyOptions = { filter(src) {
+		return !shouldSkipTemplateFile(src);
+	} };
+	try {
+		await fs.copy(sourceDir, targetDir, copyOptions);
+	} catch (error) {
+		const errorCode = error?.code;
+		if (sourceDir === fallbackDir || errorCode !== "ENOENT") throw error;
+		await fs.copy(fallbackDir, targetDir, copyOptions);
+	}
+}
 async function ensureDotGitignore(root) {
 	const gitignorePath = path.resolve(root, "gitignore");
 	const dotGitignorePath = path.resolve(root, ".gitignore");
@@ -342,15 +394,21 @@ function normalizeTemplateDependencySpecs(pkgJson) {
 * @description 根据模板创建项目
 */
 async function createProject(targetDir = "", templateName = TemplateName.default) {
-	const targetTemplateDir = path.resolve(moduleDir, "../templates", templateName);
-	if (!await fs.pathExists(targetTemplateDir)) {
+	const { preferredTemplateDir, workspaceTemplateDir } = await resolveTemplateDirs(templateName);
+	const dotGitignorePath = path.resolve(targetDir, ".gitignore");
+	const existingGitignore = await fs.pathExists(dotGitignorePath) ? await fs.readFile(dotGitignorePath, "utf8") : null;
+	if (!await fs.pathExists(preferredTemplateDir) && !await fs.pathExists(workspaceTemplateDir)) {
 		logger.warn(`没有找到 ${templateName} 模板!`);
 		return;
 	}
-	await fs.copy(targetTemplateDir, targetDir);
-	const templatePackagePath = path.resolve(targetTemplateDir, "package.json");
+	await copyTemplateDir(preferredTemplateDir, workspaceTemplateDir, targetDir);
+	const templatePackagePath = path.resolve(preferredTemplateDir, "package.json");
 	const packageJsonPath = path.resolve(targetDir, "package.json");
 	await ensureDotGitignore(targetDir);
+	if (existingGitignore !== null && await fs.pathExists(dotGitignorePath)) {
+		const currentGitignore = await fs.readFile(dotGitignorePath, "utf8");
+		await fs.writeFile(dotGitignorePath, mergeGitignoreSource(existingGitignore, currentGitignore));
+	}
 	const pkgJson = await fs.pathExists(templatePackagePath) ? await fs.readJSON(templatePackagePath) : createEmptyPackageJson();
 	normalizeTemplateDependencySpecs(pkgJson);
 	if (!pkgJson.devDependencies) pkgJson.devDependencies = {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "create-weapp-vite",
   "type": "module",
-  "version": "2.0.59",
+  "version": "2.0.60",
   "description": "create-weapp-vite",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",

package/templates/default/project.private.config.json

@@ -4,5 +4,5 @@
   "setting": {
     "compileHotReLoad": true
   },
-  "libVersion": "3.9.0"
+  "libVersion": "3.15.0"
 }

package/templates/lib/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-vite-lib-template",
   "type": "module",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "private": true,
   "description": "weapp-vite 组件库（lib 模式）模板",
   "author": "ice breaker <1324318532@qq.com>",

package/templates/lib/project.private.config.json

@@ -4,5 +4,5 @@
   "setting": {
     "compileHotReLoad": true
   },
-  "libVersion": "3.9.0"
+  "libVersion": "3.15.0"
 }

package/templates/tailwindcss/project.private.config.json

@@ -4,5 +4,5 @@
   "setting": {
     "compileHotReLoad": true
   },
-  "libVersion": "3.9.3"
+  "libVersion": "3.15.0"
 }

package/templates/tdesign/project.private.config.json

@@ -4,5 +4,5 @@
   "setting": {
     "compileHotReLoad": true
   },
-  "libVersion": "3.14.2"
+  "libVersion": "3.15.0"
 }

package/templates/vant/project.private.config.json

@@ -4,5 +4,5 @@
   "setting": {
     "compileHotReLoad": true
   },
-  "libVersion": "3.14.0"
+  "libVersion": "3.15.0"
 }

package/templates/wevu/project.private.config.json

@@ -4,5 +4,5 @@
   "setting": {
     "compileHotReLoad": true
   },
-  "libVersion": "3.13.0"
+  "libVersion": "3.15.0"
 }

package/templates/wevu-tdesign/project.private.config.json

@@ -76,5 +76,5 @@
       ]
     }
   },
-  "libVersion": "3.14.0"
+  "libVersion": "3.15.0"
 }