@weapp-core/init 6.0.8 → 6.0.10

package/dist/index.d.ts

@@ -58,6 +58,12 @@ interface PackageJsonData extends JsonObject {
   devDependencies?: Record<string, string>;
 }
 interface TsConfigData extends JsonObject {}
+/**
+ * @description init 过程中推断出的项目布局信息。
+ */
+interface ProjectLayout {
+  srcRoot: string;
+}
 /**
  * @description init 过程中单个文件的上下文结构
  */
@@ -70,6 +76,7 @@ interface ContextDocument<T> {
  * @description init 过程的上下文容器
  */
 interface Context {
+  projectLayout: ProjectLayout;
   projectConfig: ContextDocument<ProjectConfig>;
   packageJson: ContextDocument<PackageJsonData>;
   viteConfig: ContextDocument<string>;
@@ -90,9 +97,72 @@ declare function initTsJsonFiles(options: SharedUpdateOptions): Promise<{
     }[];
     files: never[];
   };
-  tsconfigApp: null;
-  tsconfigServer: null;
-  tsconfigNode: null;
+  tsconfigApp: {
+    extends: string;
+    compilerOptions: {
+      tsBuildInfoFile: string;
+      target: string;
+      lib: string[];
+      jsx: string;
+      module: string;
+      moduleResolution: string;
+      moduleDetection: string;
+      paths: {
+        '@/*': string[];
+      };
+      resolveJsonModule: boolean;
+      types: string[];
+      allowImportingTsExtensions: boolean;
+      allowJs: boolean;
+      allowSyntheticDefaultImports: boolean;
+      esModuleInterop: boolean;
+      isolatedModules: boolean;
+      strict: boolean;
+      noFallthroughCasesInSwitch: boolean;
+      noUnusedLocals: boolean;
+      noUnusedParameters: boolean;
+      noEmit: boolean;
+      verbatimModuleSyntax: boolean;
+      noUncheckedSideEffectImports: boolean;
+      erasableSyntaxOnly: boolean;
+      skipLibCheck: boolean;
+    };
+    include: string[];
+  };
+  tsconfigServer: {
+    extends: string;
+    compilerOptions: {
+      tsBuildInfoFile: string;
+      target: string;
+      lib: string[];
+      types: string[];
+    };
+    files: never[];
+  };
+  tsconfigNode: {
+    extends: string;
+    compilerOptions: {
+      tsBuildInfoFile: string;
+      target: string;
+      lib: string[];
+      module: string;
+      moduleResolution: string;
+      moduleDetection: string;
+      types: string[];
+      allowImportingTsExtensions: boolean;
+      resolveJsonModule: boolean;
+      verbatimModuleSyntax: boolean;
+      strict: boolean;
+      noFallthroughCasesInSwitch: boolean;
+      noUnusedLocals: boolean;
+      noUnusedParameters: boolean;
+      noEmit: boolean;
+      noUncheckedSideEffectImports: boolean;
+      erasableSyntaxOnly: boolean;
+      skipLibCheck: boolean;
+    };
+    include: string[];
+  };
 }>;
 //#endregion
 //#region src/packageJson.d.ts

package/dist/index.js

@@ -433,7 +433,7 @@ const _path = {
 };
 //#endregion
 //#region ../../node_modules/.pnpm/pathe@2.0.3/node_modules/pathe/dist/index.mjs
-const delimiter = globalThis.process?.platform === "win32" ? ";" : ":";
+const delimiter = /* @__PURE__ */ (() => globalThis.process?.platform === "win32" ? ";" : ":")();
 const _platforms = {
 	posix: void 0,
 	win32: void 0
@@ -462,6 +462,7 @@ function createDocument() {
 */
 function createContext() {
 	return {
+		projectLayout: { srcRoot: "src" },
 		projectConfig: createDocument(),
 		packageJson: createDocument(),
 		viteConfig: createDocument(),
@@ -483,6 +484,7 @@ const ctx = createContext();
 */
 function resetContext() {
 	const next = createContext();
+	Object.assign(ctx.projectLayout, next.projectLayout);
 	Object.assign(ctx.projectConfig, next.projectConfig);
 	Object.assign(ctx.packageJson, next.packageJson);
 	Object.assign(ctx.viteConfig, next.viteConfig);
@@ -494,6 +496,33 @@ function resetContext() {
 }
 //#endregion
 //#region src/tsconfigJson.ts
+function normalizeManagedSrcRoot(srcRoot) {
+	return srcRoot === "." ? ".." : `../${srcRoot}`;
+}
+function normalizeSrcRoot(srcRoot) {
+	if (!srcRoot) return "src";
+	if (srcRoot === ".") return ".";
+	return srcRoot.replaceAll("\\", "/").replace(/\/+$/u, "");
+}
+function createSrcIncludeGlobs(srcRoot) {
+	const prefix = `${normalizeManagedSrcRoot(srcRoot)}/**`;
+	return [
+		`${prefix}/*.ts`,
+		`${prefix}/*.tsx`,
+		`${prefix}/*.js`,
+		`${prefix}/*.jsx`,
+		`${prefix}/*.mts`,
+		`${prefix}/*.cts`,
+		`${prefix}/*.vue`,
+		`${prefix}/*.json`,
+		`${prefix}/*.d.ts`
+	];
+}
+const extraIncludeGlobs = [
+	"../types/**/*.d.ts",
+	"../env.d.ts",
+	"./**/*.d.ts"
+];
 /**
 * @description 生成默认 tsconfig.json
 */
@@ -508,6 +537,126 @@ function getDefaultTsconfigJson() {
 		files: []
 	};
 }
+/**
+* @description 生成默认 tsconfig.app.json
+*/
+function getDefaultTsconfigAppJson(options = {}) {
+	const srcRoot = normalizeSrcRoot(options.srcRoot);
+	return {
+		extends: "./tsconfig.shared.json",
+		compilerOptions: {
+			tsBuildInfoFile: "../node_modules/.tmp/tsconfig.app.tsbuildinfo",
+			target: "ES2023",
+			lib: ["ES2023", "DOM"],
+			jsx: "preserve",
+			module: "ESNext",
+			moduleResolution: "bundler",
+			moduleDetection: "force",
+			paths: { "@/*": [`${normalizeManagedSrcRoot(srcRoot)}/*`] },
+			resolveJsonModule: true,
+			types: ["miniprogram-api-typings"],
+			allowImportingTsExtensions: true,
+			allowJs: true,
+			allowSyntheticDefaultImports: true,
+			esModuleInterop: true,
+			isolatedModules: true,
+			strict: true,
+			noFallthroughCasesInSwitch: true,
+			noUnusedLocals: true,
+			noUnusedParameters: true,
+			noEmit: true,
+			verbatimModuleSyntax: true,
+			noUncheckedSideEffectImports: true,
+			erasableSyntaxOnly: true,
+			skipLibCheck: true
+		},
+		include: [...createSrcIncludeGlobs(srcRoot), ...extraIncludeGlobs]
+	};
+}
+/**
+* @description 生成默认 tsconfig.shared.json
+*/
+function getDefaultTsconfigSharedJson() {
+	return {
+		compilerOptions: {
+			target: "ES2023",
+			module: "ESNext",
+			moduleResolution: "bundler",
+			moduleDetection: "force",
+			resolveJsonModule: true,
+			allowImportingTsExtensions: true,
+			strict: true,
+			noFallthroughCasesInSwitch: true,
+			noUnusedLocals: true,
+			noUnusedParameters: true,
+			noEmit: true,
+			verbatimModuleSyntax: true,
+			noUncheckedSideEffectImports: true,
+			erasableSyntaxOnly: true,
+			skipLibCheck: true
+		},
+		files: ["./tsconfig.shared.empty.d.ts"]
+	};
+}
+/**
+* @description 生成默认 tsconfig.node.json
+*/
+function getDefaultTsconfigNodeJson(include = []) {
+	return {
+		extends: "./tsconfig.shared.json",
+		compilerOptions: {
+			tsBuildInfoFile: "../node_modules/.tmp/tsconfig.node.tsbuildinfo",
+			target: "ES2023",
+			lib: ["ES2023"],
+			module: "ESNext",
+			moduleResolution: "bundler",
+			moduleDetection: "force",
+			types: ["node"],
+			allowImportingTsExtensions: true,
+			resolveJsonModule: true,
+			verbatimModuleSyntax: true,
+			strict: true,
+			noFallthroughCasesInSwitch: true,
+			noUnusedLocals: true,
+			noUnusedParameters: true,
+			noEmit: true,
+			noUncheckedSideEffectImports: true,
+			erasableSyntaxOnly: true,
+			skipLibCheck: true
+		},
+		include: [...new Set([...[
+			"../vite.config.ts",
+			"../vite.config.*.ts",
+			"../vite.config.mts",
+			"../vite.config.*.mts",
+			"../weapp-vite.config.ts",
+			"../weapp-vite.config.*.ts",
+			"../weapp-vite.config.mts",
+			"../weapp-vite.config.*.mts",
+			"../*.config.ts",
+			"../*.config.mts",
+			"../config/**/*.ts",
+			"../config/**/*.mts",
+			"../scripts/**/*.ts",
+			"../scripts/**/*.mts"
+		], ...include])]
+	};
+}
+/**
+* @description 生成默认 tsconfig.server.json
+*/
+function getDefaultTsconfigServerJson() {
+	return {
+		extends: "./tsconfig.shared.json",
+		compilerOptions: {
+			tsBuildInfoFile: "../node_modules/.tmp/tsconfig.server.tsbuildinfo",
+			target: "ES2023",
+			lib: ["ES2023"],
+			types: ["node"]
+		},
+		files: []
+	};
+}
 //#endregion
 //#region src/tsDts.ts
 /**
@@ -523,6 +672,8 @@ function getDefaultTsDts() {
 * @description 文件读取错误
 */
 var FsReadError = class extends Error {
+	filepath;
+	cause;
 	constructor(filepath, cause) {
 		super(`Failed to read ${filepath}`);
 		this.filepath = filepath;
@@ -534,6 +685,8 @@ var FsReadError = class extends Error {
 * @description 文件写入错误
 */
 var FsWriteError = class extends Error {
+	filepath;
+	cause;
 	constructor(filepath, cause) {
 		super(`Failed to write ${filepath}`);
 		this.filepath = filepath;
@@ -597,12 +750,13 @@ function resolveOutputPath(root, dest, fallback) {
 /**
 * @description 生成默认的 vite.config.ts 模板
 */
-function getDefaultViteConfig() {
+function getDefaultViteConfig(options = {}) {
+	const { srcRoot = "src" } = options;
 	return `import { defineConfig } from 'weapp-vite/config'
 
 export default defineConfig({
   weapp: {
-    // weapp-vite options
+${srcRoot === "src" ? "    // weapp-vite options" : `    srcRoot: '${srcRoot}',`}
   },
 })
 `;
@@ -614,7 +768,7 @@ async function initViteConfigFile(options) {
 	const packageType = ctx.packageJson.value?.type ?? "module";
 	const targetFilename = ctx.viteConfig.name = packageType === "module" ? "vite.config.ts" : "vite.config.mts";
 	const outputPath = resolveOutputPath(root, dest, ctx.viteConfig.path = posix.resolve(root, targetFilename));
-	const code = getDefaultViteConfig();
+	const code = getDefaultViteConfig({ srcRoot: ctx.projectLayout.srcRoot });
 	ctx.viteConfig.value = code;
 	if (write) {
 		await writeFile(outputPath, code);
@@ -645,25 +799,59 @@ async function initTsJsonFiles(options) {
 	ctx.tsconfigNode.name = ".weapp-vite/tsconfig.node.json";
 	ctx.tsconfigNode.path = posix.resolve(root, ctx.tsconfigNode.name);
 	const tsconfig = getDefaultTsconfigJson();
+	const tsconfigSharedName = ".weapp-vite/tsconfig.shared.json";
+	const tsconfigSharedEmptyName = ".weapp-vite/tsconfig.shared.empty.d.ts";
+	const tsconfigSharedPath = posix.resolve(root, tsconfigSharedName);
+	const tsconfigSharedEmptyPath = posix.resolve(root, tsconfigSharedEmptyName);
+	const tsconfigApp = getDefaultTsconfigAppJson({ srcRoot: ctx.projectLayout.srcRoot });
+	const tsconfigNode = getDefaultTsconfigNodeJson();
+	const tsconfigServer = getDefaultTsconfigServerJson();
+	const tsconfigShared = getDefaultTsconfigSharedJson();
 	ctx.tsconfig.value = tsconfig;
-	ctx.tsconfigApp.value = null;
-	ctx.tsconfigServer.value = null;
-	ctx.tsconfigNode.value = null;
+	ctx.tsconfigApp.value = tsconfigApp;
+	ctx.tsconfigServer.value = tsconfigServer;
+	ctx.tsconfigNode.value = tsconfigNode;
 	if (write) {
 		const tsconfigOutputPath = resolveOutputPath(root, dest, tsJsonFilePath);
 		await writeJsonFile(tsconfigOutputPath, tsconfig);
 		logger.log(`✨ 写入 ${posix.relative(root, tsconfigOutputPath)} 成功!`);
+		const managedFiles = [
+			{
+				filePath: ctx.tsconfigApp.path,
+				value: tsconfigApp
+			},
+			{
+				filePath: ctx.tsconfigNode.path,
+				value: tsconfigNode
+			},
+			{
+				filePath: ctx.tsconfigServer.path,
+				value: tsconfigServer
+			},
+			{
+				filePath: tsconfigSharedPath,
+				value: tsconfigShared
+			}
+		];
+		for (const file of managedFiles) {
+			const outputPath = resolveOutputPath(root, dest, file.filePath);
+			await writeJsonFile(outputPath, file.value);
+			logger.log(`✨ 写入 ${posix.relative(root, outputPath)} 成功!`);
+		}
+		const sharedEmptyOutputPath = resolveOutputPath(root, dest, tsconfigSharedEmptyPath);
+		await writeFile(sharedEmptyOutputPath, "export {}\n");
+		logger.log(`✨ 写入 ${posix.relative(root, sharedEmptyOutputPath)} 成功!`);
 	}
 	return {
 		tsconfig,
-		tsconfigApp: null,
-		tsconfigServer: null,
-		tsconfigNode: null
+		tsconfigApp,
+		tsconfigServer,
+		tsconfigNode
 	};
 }
 //#endregion
 //#region ../../packages/weapp-vite/package.json
-var version = "6.15.8";
+var version = "6.16.41";
 //#endregion
 //#region src/npm.ts
 /**
@@ -711,7 +899,7 @@ async function latestVersion(packageName, prefix = "^", fetch = getLatestVersion
 const FALLBACK_DEP_VERSIONS = {
 	"miniprogram-api-typings": "^4.1.0",
 	"typescript": "^5.9.2",
-	"weapp-tailwindcss": "^4.3.3"
+	"weapp-tailwindcss": "^5.0.4"
 };
 /**
 * @description 创建默认 package.json 模板
@@ -755,12 +943,13 @@ async function createOrUpdatePackageJson(options) {
 			packageJson = createDefaultPackageJson();
 			logger.info(`✨ 没有找到 ${packageJsonFilename} 文件，正在创建默认 package.json ...`);
 		}
-		set(packageJson, "scripts.dev", `${command} dev`);
-		set(packageJson, "scripts.dev:open", `${command} dev -o`);
-		set(packageJson, "scripts.build", `${command} build`);
+		const scriptCommand = command === "weapp-vite" ? "wv" : command;
+		set(packageJson, "scripts.dev", `${scriptCommand} dev`);
+		set(packageJson, "scripts.dev:open", `${scriptCommand} dev -o`);
+		set(packageJson, "scripts.build", `${scriptCommand} build`);
 		if (command === "weapp-vite") {
-			set(packageJson, "scripts.open", `${command} open`);
-			set(packageJson, "scripts.g", `${command} generate`);
+			set(packageJson, "scripts.open", `${scriptCommand} open`);
+			set(packageJson, "scripts.g", `${scriptCommand} generate`);
 			set(packageJson, "devDependencies.weapp-vite", `^${version}`);
 			await Promise.all([upsertDependencyVersion(packageJson, "devDependencies.miniprogram-api-typings", "miniprogram-api-typings", { skipNetwork: !write }), upsertDependencyVersion(packageJson, "devDependencies.typescript", "typescript", { skipNetwork: !write })]);
 		}
@@ -866,6 +1055,37 @@ async function createOrUpdateProjectConfig(options) {
 	}
 }
 //#endregion
+//#region src/projectLayout.ts
+const TRAILING_SLASH_RE = /\/+$/u;
+const LEADING_DOT_SLASH_RE = /^\.\//u;
+function normalizeRelativeDir(value) {
+	return value.replaceAll("\\", "/").replace(LEADING_DOT_SLASH_RE, "").replace(TRAILING_SLASH_RE, "") || ".";
+}
+function isSafeRelativeDir(value) {
+	return typeof value === "string" && value.trim().length > 0 && !posix.isAbsolute(value) && !value.split(/[\\/]+/u).includes("..");
+}
+async function hasAppJson(root, srcRoot) {
+	return await fs.pathExists(posix.resolve(root, srcRoot, "app.json"));
+}
+function pushCandidate(candidates, value) {
+	if (!isSafeRelativeDir(value)) return;
+	const normalized = normalizeRelativeDir(value);
+	if (!candidates.includes(normalized)) candidates.push(normalized);
+}
+/**
+* @description 根据原生小程序项目配置推断源码根目录。
+*/
+async function resolveProjectSrcRoot(root, projectConfig) {
+	const candidates = [];
+	pushCandidate(candidates, projectConfig?.srcMiniprogramRoot);
+	pushCandidate(candidates, projectConfig?.miniprogramRoot);
+	pushCandidate(candidates, ".");
+	pushCandidate(candidates, "src");
+	pushCandidate(candidates, "miniprogram");
+	for (const candidate of candidates) if (await hasAppJson(root, candidate)) return candidate;
+	return "src";
+}
+//#endregion
 //#region src/gitignore.ts
 const DEFAULT_GITIGNORE = `# dependencies
 node_modules
@@ -922,17 +1142,17 @@ function ensureTrailingNewline(value) {
 function mergeGitignore(existing) {
 	const normalizedExisting = normalizeLineEndings(existing ?? "");
 	const merged = [...normalizedExisting.length ? normalizedExisting.split("\n") : []];
-	while (merged.length > 0 && merged.at(-1) === "") merged.pop();
+	while (merged.length > 0 && merged[merged.length - 1] === "") merged.pop();
 	const seen = new Set(merged);
 	let appendedNonBlank = false;
 	for (const line of DEFAULT_GITIGNORE.split("\n")) {
 		if (line.length === 0) {
-			if (merged.length === 0 || merged.at(-1) === "") continue;
+			if (merged.length === 0 || merged[merged.length - 1] === "") continue;
 			merged.push("");
 			continue;
 		}
 		if (seen.has(line)) continue;
-		if (!appendedNonBlank && merged.length > 0 && merged.at(-1) !== "") merged.push("");
+		if (!appendedNonBlank && merged.length > 0 && merged[merged.length - 1] !== "") merged.push("");
 		merged.push(line);
 		seen.add(line);
 		appendedNonBlank = true;
@@ -959,7 +1179,8 @@ async function updateGitIgnore(options) {
 */
 async function initConfig(options) {
 	const { root = process$1.cwd(), command } = options;
-	await createOrUpdateProjectConfig({ root });
+	const projectConfig = await createOrUpdateProjectConfig({ root });
+	ctx.projectLayout.srcRoot = await resolveProjectSrcRoot(root, projectConfig);
 	await createOrUpdatePackageJson({
 		root,
 		command

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-core/init",
   "type": "module",
-  "version": "6.0.8",
+  "version": "6.0.10",
   "description": "@weapp-core/init",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -39,8 +39,8 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "dependencies": {
-    "@weapp-core/logger": "^3.1.1",
-    "@weapp-core/shared": "^3.0.4"
+    "@weapp-core/logger": "3.1.1",
+    "@weapp-core/shared": "3.0.4"
   },
   "scripts": {
     "dev": "tsdown -w --sourcemap",