@tmsfe/tmskit 0.0.66 → 0.0.68

package/dist/index.cjs.js

@@ -1548,6 +1548,52 @@ function mergeSubPackages(existingPackages, newPackages) {
   return resultPackages;
 }
 
+/**
+ * 清理 preloadRule 中引用了不存在分包的条目
+ */
+function cleanPreloadRule(appJson) {
+  if (!appJson.preloadRule) return;
+  const subpackages = appJson.subpackages || [];
+  const existingSubpackageNames = new Set(subpackages.map(sub => sub.name).filter(Boolean));
+  const existingSubpackageRoots = new Set(subpackages.map(sub => sub.root).filter(Boolean));
+  Object.keys(appJson.preloadRule).forEach(pageKey => {
+    const rule = appJson.preloadRule[pageKey];
+    if (rule.packages) {
+      rule.packages = rule.packages.filter(pkg => existingSubpackageNames.has(pkg) || existingSubpackageRoots.has(pkg));
+      if (rule.packages.length === 0) {
+        delete appJson.preloadRule[pageKey];
+      }
+    }
+  });
+  if (Object.keys(appJson.preloadRule).length === 0) {
+    delete appJson.preloadRule;
+  }
+}
+
+/**
+ * 清理 entranceDeclare 中引用了不存在页面的条目
+ */
+function cleanEntranceDeclare(appJson) {
+  // 收集所有有效页面路径（主包 pages + 分包 pages）
+  const allValidPages = new Set(appJson.pages || []);
+  (appJson.subpackages || []).forEach(sub => {
+    (sub.pages || []).forEach(page => {
+      allValidPages.add(`${sub.root}/${page}`);
+    });
+  });
+  if (!appJson.entranceDeclare) return;
+  Object.keys(appJson.entranceDeclare).forEach(key => {
+    const entry = appJson.entranceDeclare[key];
+    if (entry && entry.path && !allValidPages.has(entry.path)) {
+      info$g(`[devStrictModulesInclude] 移除 entranceDeclare.${key}，页面 ${entry.path} 不存在`);
+      delete appJson.entranceDeclare[key];
+    }
+  });
+  if (Object.keys(appJson.entranceDeclare).length === 0) {
+    delete appJson.entranceDeclare;
+  }
+}
+
 /**
  * 动态生成编译后的app.json
  * @param {object} tmsConfig
@@ -1574,47 +1620,10 @@ async function buildOutputAppJson$3(tmsConfig, modules) {
     // 更新主包，需在subpackages处理完成后执行， pages/
     updateMainPackages(appJson, tmsConfig.mainPackages);
 
-    // devStrictModulesInclude 模式下，清理 preloadRule 中引用了不存在分包的条目
-    if (tmsConfig.devStrictModulesInclude && appJson.preloadRule) {
-      const existingSubpackageNames = new Set((appJson.subpackages || []).map(sub => sub.name).filter(Boolean));
-      const existingSubpackageRoots = new Set((appJson.subpackages || []).map(sub => sub.root).filter(Boolean));
-      Object.keys(appJson.preloadRule).forEach(pageKey => {
-        const rule = appJson.preloadRule[pageKey];
-        if (rule.packages) {
-          rule.packages = rule.packages.filter(pkg => existingSubpackageNames.has(pkg) || existingSubpackageRoots.has(pkg));
-          if (rule.packages.length === 0) {
-            delete appJson.preloadRule[pageKey];
-          }
-        }
-      });
-      if (Object.keys(appJson.preloadRule).length === 0) {
-        delete appJson.preloadRule;
-      }
-    }
-
-    // devStrictModulesInclude 模式下，清理引用了不存在页面路径的字段
+    // devStrictModulesInclude 模式下，清理无效引用
     if (tmsConfig.devStrictModulesInclude) {
-      // 收集所有有效页面路径（主包 pages + 分包 pages）
-      const allValidPages = new Set(appJson.pages || []);
-      (appJson.subpackages || []).forEach(sub => {
-        (sub.pages || []).forEach(page => {
-          allValidPages.add(`${sub.root}/${page}`);
-        });
-      });
-
-      // 清理 entranceDeclare 中引用了不存在页面的条目
-      if (appJson.entranceDeclare) {
-        Object.keys(appJson.entranceDeclare).forEach(key => {
-          const entry = appJson.entranceDeclare[key];
-          if (entry && entry.path && !allValidPages.has(entry.path)) {
-            info$g(`[devStrictModulesInclude] 移除 entranceDeclare.${key}，页面 ${entry.path} 不存在`);
-            delete appJson.entranceDeclare[key];
-          }
-        });
-        if (Object.keys(appJson.entranceDeclare).length === 0) {
-          delete appJson.entranceDeclare;
-        }
-      }
+      cleanPreloadRule(appJson);
+      cleanEntranceDeclare(appJson);
     }
 
     // 模板渲染：先将 app.json 转为字符串，然后通过 preprocess 渲染
@@ -2692,6 +2701,29 @@ function normalizePath(p) {
   return p.replace(/\\/g, '/');
 }
 
+/**
+ * 将组件路径 resolve 为 dist 中的绝对路径
+ */
+function resolveComponentPath(componentPath, currentFileDestPath, outputDir) {
+  if (componentPath.startsWith('/')) {
+    return path$8.resolve(outputDir, componentPath.slice(1));
+  }
+  const currentDir = path$8.dirname(currentFileDestPath);
+  return path$8.resolve(currentDir, componentPath);
+}
+
+/**
+ * 检查组件路径是否属于某个已编译模块
+ */
+function isInValidModule(relativeToOutput, validModulePaths) {
+  for (const modulePath of validModulePaths) {
+    if (relativeToOutput === modulePath || relativeToOutput.startsWith(`${modulePath}/`)) {
+      return true;
+    }
+  }
+  return false;
+}
+
 /**
  * 判断组件路径是否应该被移除
  * @param {string} componentPath usingComponents 中的路径
@@ -2711,39 +2743,24 @@ function shouldRemoveComponent(componentPath, currentFileDestPath, outputDir, mo
   if (!componentPath.startsWith('.') && !componentPath.startsWith('/')) {
     return false;
   }
-
-  // 统一计算组件在 dist 中的绝对路径
-  let resolvedComponentPath;
-  if (componentPath.startsWith('/')) {
-    // 小程序绝对路径（如 /modules/xxx），相对于 dist 根目录
-    resolvedComponentPath = path$8.resolve(outputDir, componentPath.slice(1));
-  } else {
-    // 相对路径，相对于当前文件在 dist 中的位置
-    const currentDir = path$8.dirname(currentFileDestPath);
-    resolvedComponentPath = path$8.resolve(currentDir, componentPath);
-  }
+  const resolvedPath = resolveComponentPath(componentPath, currentFileDestPath, outputDir);
 
   // 优先判断：组件是否在当前模块的输出目录内
-  const relativeToModule = normalizePath(path$8.relative(moduleDestPath, resolvedComponentPath));
+  const relativeToModule = normalizePath(path$8.relative(moduleDestPath, resolvedPath));
   if (!relativeToModule.startsWith('..')) {
     return false;
   }
 
   // 组件在当前模块外，检查是否属于其他已编译模块
-  const relativeToOutput = normalizePath(path$8.relative(outputDir, resolvedComponentPath));
+  const relativeToOutput = normalizePath(path$8.relative(outputDir, resolvedPath));
 
   // 路径离开了 outputDir（以 .. 开头），保留不处理
   if (relativeToOutput.startsWith('..')) {
     return false;
   }
-  for (const modulePath of validModulePaths) {
-    if (relativeToOutput === modulePath || relativeToOutput.startsWith(modulePath + '/')) {
-      return false;
-    }
-  }
 
   // 不属于任何已编译模块 → 移除
-  return true;
+  return !isInValidModule(relativeToOutput, validModulePaths);
 }
 
 /**
@@ -2776,10 +2793,49 @@ function getValidModulePaths(tmsConfig) {
       }
     }
   });
+
+  // eslint-disable-next-line no-param-reassign
   tmsConfig._validModulePaths = paths;
   return paths;
 }
 
+/**
+ * 处理单个 JSON 文件，移除无效组件引用
+ */
+function processJsonFile(file, moduleDestPath, moduleFromPath, outputDir, validModulePaths) {
+  let json;
+  try {
+    json = JSON.parse(String(file.contents));
+  } catch (e) {
+    return file;
+  }
+  if (!json.usingComponents || typeof json.usingComponents !== 'object') {
+    return file;
+  }
+  const currentFileSrcPath = file.history[0] || file.path;
+  const relativeToModuleSrc = path$8.relative(moduleFromPath, currentFileSrcPath);
+  const currentFileDestPath = path$8.join(moduleDestPath, relativeToModuleSrc);
+  const keysToRemove = [];
+  Object.keys(json.usingComponents).forEach(componentKey => {
+    const componentPath = json.usingComponents[componentKey];
+    if (shouldRemoveComponent(componentPath, currentFileDestPath, outputDir, moduleDestPath, validModulePaths)) {
+      keysToRemove.push(componentKey);
+    }
+  });
+  if (keysToRemove.length > 0) {
+    keysToRemove.forEach(key => {
+      info$c(`[strictModulesFilter] 移除 ${path$8.basename(currentFileSrcPath)} 中的组件引用: ${key} -> ${json.usingComponents[key]}`);
+      delete json.usingComponents[key];
+      if (json.componentPlaceholder && json.componentPlaceholder[key]) {
+        delete json.componentPlaceholder[key];
+      }
+    });
+    // eslint-disable-next-line no-param-reassign
+    file.contents = Buffer.from(JSON.stringify(json, null, 2));
+  }
+  return file;
+}
+
 /**
  * 严格模块过滤 gulp 插件
  * @param {Object} tmsConfig 配置对象
@@ -2787,7 +2843,6 @@ function getValidModulePaths(tmsConfig) {
  * @returns {Object} through2 转换流
  */
 function strictModulesFilter$1(tmsConfig, module) {
-  // 不在严格模式下直接透传
   if (!tmsConfig.devStrictModulesInclude) {
     return through$2.obj();
   }
@@ -2799,57 +2854,13 @@ function strictModulesFilter$1(tmsConfig, module) {
       this.push(file);
       return cb();
     }
-
-    // 自定义模块（如 watchExtendFiles）或根目录文件不处理
-    if (module.custom || !moduleDestPath || !moduleFromPath) {
-      this.push(file);
-      return cb();
-    }
-
-    // 根目录编译任务（from === outputDir 的父目录）不处理
-    if (moduleDestPath === outputDir) {
-      this.push(file);
-      return cb();
-    }
-    let json;
-    try {
-      json = JSON.parse(String(file.contents));
-    } catch (e) {
-      this.push(file);
-      return cb();
-    }
-    if (!json.usingComponents || typeof json.usingComponents !== 'object') {
+    if (module.custom || !moduleDestPath || !moduleFromPath || moduleDestPath === outputDir) {
       this.push(file);
       return cb();
     }
-
-    // 计算当前文件的编译输出路径
-    const currentFileSrcPath = file.history[0] || file.path;
-    const relativeToModuleSrc = path$8.relative(moduleFromPath, currentFileSrcPath);
-    const currentFileDestPath = path$8.join(moduleDestPath, relativeToModuleSrc);
-
-    // 延迟获取有效模块路径集合（首次文件处理时计算并缓存）
     const validModulePaths = getValidModulePaths(tmsConfig);
-    const keysToRemove = [];
-    Object.keys(json.usingComponents).forEach(componentKey => {
-      const componentPath = json.usingComponents[componentKey];
-      if (shouldRemoveComponent(componentPath, currentFileDestPath, outputDir, moduleDestPath, validModulePaths)) {
-        keysToRemove.push(componentKey);
-      }
-    });
-    if (keysToRemove.length > 0) {
-      keysToRemove.forEach(key => {
-        info$c(`[strictModulesFilter] 移除 ${path$8.basename(currentFileSrcPath)} 中的组件引用: ${key} -> ${json.usingComponents[key]}`);
-        delete json.usingComponents[key];
-        // 同步清理 componentPlaceholder
-        if (json.componentPlaceholder && json.componentPlaceholder[key]) {
-          delete json.componentPlaceholder[key];
-        }
-      });
-      file.contents = Buffer.from(JSON.stringify(json, null, 2));
-    }
-    this.push(file);
-    cb();
+    this.push(processJsonFile(file, moduleDestPath, moduleFromPath, outputDir, validModulePaths));
+    return cb();
   });
 }
 var strictModulesFilter_1 = {
@@ -4450,7 +4461,7 @@ var entry = [{
 
 var require$$12 = {
 	name: "@tmsfe/tmskit",
-	version: "0.0.66",
+	version: "0.0.68",
 	description: "tmskit",
 	main: "dist/index.cjs",
 	bin: {
@@ -4509,7 +4520,7 @@ var require$$12 = {
 		lodash: "^4.17.21",
 		metalsmith: "^2.3.0",
 		minimatch: "^5.1.0",
-		"miniprogram-ci": "2.1.40",
+		"miniprogram-ci": "2.1.41",
 		moment: "^2.29.2",
 		"object-assign": "^4.0.1",
 		ora: "^5.4.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.66",
+  "version": "0.0.68",
   "description": "tmskit",
   "main": "dist/index.cjs",
   "bin": {
@@ -59,7 +59,7 @@
     "lodash": "^4.17.21",
     "metalsmith": "^2.3.0",
     "minimatch": "^5.1.0",
-    "miniprogram-ci": "2.1.40",
+    "miniprogram-ci": "2.1.41",
     "moment": "^2.29.2",
     "object-assign": "^4.0.1",
     "ora": "^5.4.1",

package/src/compile/plugins/strictModulesFilter.js

@@ -19,6 +19,29 @@ function normalizePath(p) {
   return p.replace(/\\/g, '/');
 }
 
+/**
+ * 将组件路径 resolve 为 dist 中的绝对路径
+ */
+function resolveComponentPath(componentPath, currentFileDestPath, outputDir) {
+  if (componentPath.startsWith('/')) {
+    return path.resolve(outputDir, componentPath.slice(1));
+  }
+  const currentDir = path.dirname(currentFileDestPath);
+  return path.resolve(currentDir, componentPath);
+}
+
+/**
+ * 检查组件路径是否属于某个已编译模块
+ */
+function isInValidModule(relativeToOutput, validModulePaths) {
+  for (const modulePath of validModulePaths) {
+    if (relativeToOutput === modulePath || relativeToOutput.startsWith(`${modulePath}/`)) {
+      return true;
+    }
+  }
+  return false;
+}
+
 /**
  * 判断组件路径是否应该被移除
  * @param {string} componentPath usingComponents 中的路径
@@ -39,39 +62,24 @@ function shouldRemoveComponent(componentPath, currentFileDestPath, outputDir, mo
     return false;
   }
 
-  // 统一计算组件在 dist 中的绝对路径
-  let resolvedComponentPath;
-  if (componentPath.startsWith('/')) {
-    // 小程序绝对路径（如 /modules/xxx），相对于 dist 根目录
-    resolvedComponentPath = path.resolve(outputDir, componentPath.slice(1));
-  } else {
-    // 相对路径，相对于当前文件在 dist 中的位置
-    const currentDir = path.dirname(currentFileDestPath);
-    resolvedComponentPath = path.resolve(currentDir, componentPath);
-  }
+  const resolvedPath = resolveComponentPath(componentPath, currentFileDestPath, outputDir);
 
   // 优先判断：组件是否在当前模块的输出目录内
-  const relativeToModule = normalizePath(path.relative(moduleDestPath, resolvedComponentPath));
+  const relativeToModule = normalizePath(path.relative(moduleDestPath, resolvedPath));
   if (!relativeToModule.startsWith('..')) {
     return false;
   }
 
   // 组件在当前模块外，检查是否属于其他已编译模块
-  const relativeToOutput = normalizePath(path.relative(outputDir, resolvedComponentPath));
+  const relativeToOutput = normalizePath(path.relative(outputDir, resolvedPath));
 
   // 路径离开了 outputDir（以 .. 开头），保留不处理
   if (relativeToOutput.startsWith('..')) {
     return false;
   }
 
-  for (const modulePath of validModulePaths) {
-    if (relativeToOutput === modulePath || relativeToOutput.startsWith(modulePath + '/')) {
-      return false;
-    }
-  }
-
   // 不属于任何已编译模块 → 移除
-  return true;
+  return !isInValidModule(relativeToOutput, validModulePaths);
 }
 
 /**
@@ -107,10 +115,53 @@ function getValidModulePaths(tmsConfig) {
     }
   });
 
+  // eslint-disable-next-line no-param-reassign
   tmsConfig._validModulePaths = paths;
   return paths;
 }
 
+/**
+ * 处理单个 JSON 文件，移除无效组件引用
+ */
+function processJsonFile(file, moduleDestPath, moduleFromPath, outputDir, validModulePaths) {
+  let json;
+  try {
+    json = JSON.parse(String(file.contents));
+  } catch (e) {
+    return file;
+  }
+
+  if (!json.usingComponents || typeof json.usingComponents !== 'object') {
+    return file;
+  }
+
+  const currentFileSrcPath = file.history[0] || file.path;
+  const relativeToModuleSrc = path.relative(moduleFromPath, currentFileSrcPath);
+  const currentFileDestPath = path.join(moduleDestPath, relativeToModuleSrc);
+
+  const keysToRemove = [];
+  Object.keys(json.usingComponents).forEach((componentKey) => {
+    const componentPath = json.usingComponents[componentKey];
+    if (shouldRemoveComponent(componentPath, currentFileDestPath, outputDir, moduleDestPath, validModulePaths)) {
+      keysToRemove.push(componentKey);
+    }
+  });
+
+  if (keysToRemove.length > 0) {
+    keysToRemove.forEach((key) => {
+      info(`[strictModulesFilter] 移除 ${path.basename(currentFileSrcPath)} 中的组件引用: ${key} -> ${json.usingComponents[key]}`);
+      delete json.usingComponents[key];
+      if (json.componentPlaceholder && json.componentPlaceholder[key]) {
+        delete json.componentPlaceholder[key];
+      }
+    });
+    // eslint-disable-next-line no-param-reassign
+    file.contents = Buffer.from(JSON.stringify(json, null, 2));
+  }
+
+  return file;
+}
+
 /**
  * 严格模块过滤 gulp 插件
  * @param {Object} tmsConfig 配置对象
@@ -118,7 +169,6 @@ function getValidModulePaths(tmsConfig) {
  * @returns {Object} through2 转换流
  */
 function strictModulesFilter(tmsConfig, module) {
-  // 不在严格模式下直接透传
   if (!tmsConfig.devStrictModulesInclude) {
     return through.obj();
   }
@@ -133,62 +183,14 @@ function strictModulesFilter(tmsConfig, module) {
       return cb();
     }
 
-    // 自定义模块（如 watchExtendFiles）或根目录文件不处理
-    if (module.custom || !moduleDestPath || !moduleFromPath) {
-      this.push(file);
-      return cb();
-    }
-
-    // 根目录编译任务（from === outputDir 的父目录）不处理
-    if (moduleDestPath === outputDir) {
-      this.push(file);
-      return cb();
-    }
-
-    let json;
-    try {
-      json = JSON.parse(String(file.contents));
-    } catch (e) {
+    if (module.custom || !moduleDestPath || !moduleFromPath || moduleDestPath === outputDir) {
       this.push(file);
       return cb();
     }
 
-    if (!json.usingComponents || typeof json.usingComponents !== 'object') {
-      this.push(file);
-      return cb();
-    }
-
-    // 计算当前文件的编译输出路径
-    const currentFileSrcPath = file.history[0] || file.path;
-    const relativeToModuleSrc = path.relative(moduleFromPath, currentFileSrcPath);
-    const currentFileDestPath = path.join(moduleDestPath, relativeToModuleSrc);
-
-    // 延迟获取有效模块路径集合（首次文件处理时计算并缓存）
     const validModulePaths = getValidModulePaths(tmsConfig);
-
-    const keysToRemove = [];
-    Object.keys(json.usingComponents).forEach((componentKey) => {
-      const componentPath = json.usingComponents[componentKey];
-      if (shouldRemoveComponent(componentPath, currentFileDestPath, outputDir, moduleDestPath, validModulePaths)) {
-        keysToRemove.push(componentKey);
-      }
-    });
-
-    if (keysToRemove.length > 0) {
-      keysToRemove.forEach((key) => {
-        info(`[strictModulesFilter] 移除 ${path.basename(currentFileSrcPath)} 中的组件引用: ${key} -> ${json.usingComponents[key]}`);
-        delete json.usingComponents[key];
-        // 同步清理 componentPlaceholder
-        if (json.componentPlaceholder && json.componentPlaceholder[key]) {
-          delete json.componentPlaceholder[key];
-        }
-      });
-
-      file.contents = Buffer.from(JSON.stringify(json, null, 2));
-    }
-
-    this.push(file);
-    cb();
+    this.push(processJsonFile(file, moduleDestPath, moduleFromPath, outputDir, validModulePaths));
+    return cb();
   });
 }
 

package/src/core/buildAppJson.js

@@ -168,6 +168,58 @@ function mergeSubPackages(existingPackages, newPackages) {
   return resultPackages;
 }
 
+/**
+ * 清理 preloadRule 中引用了不存在分包的条目
+ */
+function cleanPreloadRule(appJson) {
+  if (!appJson.preloadRule) return;
+
+  const subpackages = appJson.subpackages || [];
+  const existingSubpackageNames = new Set(subpackages.map(sub => sub.name).filter(Boolean));
+  const existingSubpackageRoots = new Set(subpackages.map(sub => sub.root).filter(Boolean));
+
+  Object.keys(appJson.preloadRule).forEach((pageKey) => {
+    const rule = appJson.preloadRule[pageKey];
+    if (rule.packages) {
+      rule.packages = rule.packages.filter(pkg => existingSubpackageNames.has(pkg) || existingSubpackageRoots.has(pkg));
+      if (rule.packages.length === 0) {
+        delete appJson.preloadRule[pageKey];
+      }
+    }
+  });
+
+  if (Object.keys(appJson.preloadRule).length === 0) {
+    delete appJson.preloadRule;
+  }
+}
+
+/**
+ * 清理 entranceDeclare 中引用了不存在页面的条目
+ */
+function cleanEntranceDeclare(appJson) {
+  // 收集所有有效页面路径（主包 pages + 分包 pages）
+  const allValidPages = new Set(appJson.pages || []);
+  (appJson.subpackages || []).forEach((sub) => {
+    (sub.pages || []).forEach((page) => {
+      allValidPages.add(`${sub.root}/${page}`);
+    });
+  });
+
+  if (!appJson.entranceDeclare) return;
+
+  Object.keys(appJson.entranceDeclare).forEach((key) => {
+    const entry = appJson.entranceDeclare[key];
+    if (entry && entry.path && !allValidPages.has(entry.path)) {
+      info(`[devStrictModulesInclude] 移除 entranceDeclare.${key}，页面 ${entry.path} 不存在`);
+      delete appJson.entranceDeclare[key];
+    }
+  });
+
+  if (Object.keys(appJson.entranceDeclare).length === 0) {
+    delete appJson.entranceDeclare;
+  }
+}
+
 /**
  * 动态生成编译后的app.json
  * @param {object} tmsConfig
@@ -193,53 +245,10 @@ async function buildOutputAppJson(tmsConfig, modules) {
     // 更新主包，需在subpackages处理完成后执行， pages/
     updateMainPackages(appJson, tmsConfig.mainPackages);
 
-    // devStrictModulesInclude 模式下，清理 preloadRule 中引用了不存在分包的条目
-    if (tmsConfig.devStrictModulesInclude && appJson.preloadRule) {
-      const existingSubpackageNames = new Set(
-        (appJson.subpackages || []).map(sub => sub.name).filter(Boolean),
-      );
-      const existingSubpackageRoots = new Set(
-        (appJson.subpackages || []).map(sub => sub.root).filter(Boolean),
-      );
-      Object.keys(appJson.preloadRule).forEach((pageKey) => {
-        const rule = appJson.preloadRule[pageKey];
-        if (rule.packages) {
-          rule.packages = rule.packages.filter(
-            pkg => existingSubpackageNames.has(pkg) || existingSubpackageRoots.has(pkg),
-          );
-          if (rule.packages.length === 0) {
-            delete appJson.preloadRule[pageKey];
-          }
-        }
-      });
-      if (Object.keys(appJson.preloadRule).length === 0) {
-        delete appJson.preloadRule;
-      }
-    }
-
-    // devStrictModulesInclude 模式下，清理引用了不存在页面路径的字段
+    // devStrictModulesInclude 模式下，清理无效引用
     if (tmsConfig.devStrictModulesInclude) {
-      // 收集所有有效页面路径（主包 pages + 分包 pages）
-      const allValidPages = new Set(appJson.pages || []);
-      (appJson.subpackages || []).forEach((sub) => {
-        (sub.pages || []).forEach((page) => {
-          allValidPages.add(`${sub.root}/${page}`);
-        });
-      });
-
-      // 清理 entranceDeclare 中引用了不存在页面的条目
-      if (appJson.entranceDeclare) {
-        Object.keys(appJson.entranceDeclare).forEach((key) => {
-          const entry = appJson.entranceDeclare[key];
-          if (entry && entry.path && !allValidPages.has(entry.path)) {
-            info(`[devStrictModulesInclude] 移除 entranceDeclare.${key}，页面 ${entry.path} 不存在`);
-            delete appJson.entranceDeclare[key];
-          }
-        });
-        if (Object.keys(appJson.entranceDeclare).length === 0) {
-          delete appJson.entranceDeclare;
-        }
-      }
+      cleanPreloadRule(appJson);
+      cleanEntranceDeclare(appJson);
     }
 
     // 模板渲染：先将 app.json 转为字符串，然后通过 preprocess 渲染