weapp-vite 5.8.0 → 5.9.1

package/dist/{chunk-DHQDH7RC.mjs → chunk-R4SL5LL2.mjs}

@@ -3,7 +3,7 @@ import {
   __require,
   __toESM,
   init_esm_shims
-} from "./chunk-TZWATIK3.mjs";
+} from "./chunk-YNQOGMVA.mjs";
 
 // ../../node_modules/.pnpm/semver@7.7.3/node_modules/semver/internal/debug.js
 var require_debug = __commonJS({
@@ -2677,9 +2677,152 @@ function resolveBaseDir(configService) {
   }
   return configService.cwd;
 }
+function cloneAutoImportComponents(config) {
+  if (config === false || !config) {
+    return void 0;
+  }
+  const cloned = {};
+  if (config.globs?.length) {
+    cloned.globs = [...config.globs];
+  }
+  if (config.resolvers?.length) {
+    cloned.resolvers = [...config.resolvers];
+  }
+  if (config.output !== void 0) {
+    cloned.output = config.output;
+  }
+  if (config.typedComponents !== void 0) {
+    cloned.typedComponents = config.typedComponents;
+  }
+  if (config.htmlCustomData !== void 0) {
+    cloned.htmlCustomData = config.htmlCustomData;
+  }
+  return cloned;
+}
+function mergeGlobs(base, extra) {
+  const values = [
+    ...base ?? [],
+    ...extra ?? []
+  ].map((entry) => entry?.trim()).filter((entry) => Boolean(entry));
+  if (!values.length) {
+    return void 0;
+  }
+  const deduped = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const entry of values) {
+    if (seen.has(entry)) {
+      continue;
+    }
+    seen.add(entry);
+    deduped.push(entry);
+  }
+  return deduped;
+}
+function mergeResolvers(base, extra) {
+  const merged = [
+    ...base ?? [],
+    ...extra ?? []
+  ].filter(Boolean);
+  return merged.length ? merged : void 0;
+}
+function mergeAutoImportComponents(lower, upper, preferUpperScalars = false) {
+  if (!lower && !upper) {
+    return void 0;
+  }
+  if (!lower) {
+    return cloneAutoImportComponents(upper);
+  }
+  if (!upper) {
+    return cloneAutoImportComponents(lower);
+  }
+  const merged = {};
+  const globs = mergeGlobs(lower.globs, upper.globs);
+  if (globs) {
+    merged.globs = globs;
+  }
+  const resolvers = mergeResolvers(lower.resolvers, upper.resolvers);
+  if (resolvers) {
+    merged.resolvers = resolvers;
+  }
+  const pickScalar = (baseline, candidate) => {
+    return preferUpperScalars ? candidate ?? baseline : baseline ?? candidate;
+  };
+  const output = pickScalar(lower.output, upper.output);
+  if (output !== void 0) {
+    merged.output = output;
+  }
+  const typedComponents = pickScalar(lower.typedComponents, upper.typedComponents);
+  if (typedComponents !== void 0) {
+    merged.typedComponents = typedComponents;
+  }
+  const htmlCustomData = pickScalar(lower.htmlCustomData, upper.htmlCustomData);
+  if (htmlCustomData !== void 0) {
+    merged.htmlCustomData = htmlCustomData;
+  }
+  return merged;
+}
+function normalizeGlobRoot(root) {
+  return root.replace(/\\/g, "/").replace(/^\/+|\/+$/g, "");
+}
+function createDefaultAutoImportComponents(configService) {
+  const globs = /* @__PURE__ */ new Set();
+  globs.add("components/**/*.wxml");
+  const subPackages = configService.weappViteConfig?.subPackages;
+  if (subPackages) {
+    for (const [root, subConfig] of Object.entries(subPackages)) {
+      if (!root) {
+        continue;
+      }
+      if (subConfig?.autoImportComponents === false) {
+        continue;
+      }
+      const normalized = normalizeGlobRoot(root);
+      if (!normalized) {
+        continue;
+      }
+      globs.add(`${normalized}/components/**/*.wxml`);
+    }
+  }
+  return globs.size ? { globs: Array.from(globs) } : void 0;
+}
 function getAutoImportConfig(configService) {
-  const weappConfig = configService?.weappViteConfig;
-  return weappConfig?.autoImportComponents ?? weappConfig?.enhance?.autoImportComponents;
+  if (!configService) {
+    return void 0;
+  }
+  const weappConfig = configService.weappViteConfig;
+  if (!weappConfig) {
+    return void 0;
+  }
+  const userConfigured = weappConfig.autoImportComponents ?? weappConfig.enhance?.autoImportComponents;
+  if (userConfigured === false) {
+    return void 0;
+  }
+  const fallbackConfig = userConfigured === void 0 ? createDefaultAutoImportComponents(configService) : void 0;
+  const baseConfig = cloneAutoImportComponents(userConfigured ?? fallbackConfig);
+  const subPackageConfigs = weappConfig.subPackages;
+  const currentRoot = configService.currentSubPackageRoot;
+  if (currentRoot) {
+    const scopedRaw = subPackageConfigs?.[currentRoot]?.autoImportComponents;
+    if (scopedRaw === false) {
+      return void 0;
+    }
+    const scoped = cloneAutoImportComponents(scopedRaw);
+    return mergeAutoImportComponents(baseConfig, scoped, true) ?? baseConfig ?? scoped;
+  }
+  let merged = baseConfig;
+  if (subPackageConfigs) {
+    for (const root of Object.keys(subPackageConfigs)) {
+      const scopedRaw = subPackageConfigs[root]?.autoImportComponents;
+      if (scopedRaw === false || !scopedRaw) {
+        continue;
+      }
+      const scoped = cloneAutoImportComponents(scopedRaw);
+      if (scoped) {
+        merged = mergeAutoImportComponents(merged, scoped, false);
+      }
+    }
+  }
+  return merged;
 }
 function resolveManifestOutputPath(configService, manifestFileName = DEFAULT_AUTO_IMPORT_MANIFEST_FILENAME) {
   if (!configService) {
@@ -21465,8 +21608,8 @@ function createAutoImportPlugin(state) {
       if (!state.resolvedConfig) {
         return;
       }
-      const weappConfig = configService.weappViteConfig;
-      const globs = weappConfig?.autoImportComponents?.globs ?? weappConfig?.enhance?.autoImportComponents?.globs;
+      const autoImportConfig = getAutoImportConfig(configService);
+      const globs = autoImportConfig?.globs;
       const globsKey = globs?.join("\0") ?? "";
       if (globsKey !== state.lastGlobsKey) {
         state.initialScanDone = false;
@@ -27333,6 +27476,7 @@ function createScanService(ctx) {
           const subPackageConfig = ctx.configService.weappViteConfig?.subPackages?.[subPackage.root];
           meta.subPackage.dependencies = subPackageConfig?.dependencies;
           meta.subPackage.inlineConfig = subPackageConfig?.inlineConfig;
+          meta.autoImportComponents = subPackageConfig?.autoImportComponents;
           meta.styleEntries = normalizeSubPackageStyleEntries(
             subPackageConfig?.styles,
             subPackage,

package/dist/{chunk-SSYIWHY2.mjs → chunk-U52F47CT.mjs}

@@ -1,6 +1,6 @@
 import {
   init_esm_shims
-} from "./chunk-TZWATIK3.mjs";
+} from "./chunk-YNQOGMVA.mjs";
 
 // src/json.ts
 init_esm_shims();

package/dist/{chunk-TZWATIK3.mjs → chunk-YNQOGMVA.mjs}

@@ -33,11 +33,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../../node_modules/.pnpm/tsup@8.5.0_@swc+core@1.15.0_jiti@2.6.1_postcss@8.5.6_tsx@4.20.6_typescript@5.9.3_yaml@2.8.1/node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@8.5.0_@swc+core@1.15.1_jiti@2.6.1_postcss@8.5.6_tsx@4.20.6_typescript@5.9.3_yaml@2.8.1/node_modules/tsup/assets/esm_shims.js
 import path from "path";
 import { fileURLToPath } from "url";
 var init_esm_shims = __esm({
-  "../../node_modules/.pnpm/tsup@8.5.0_@swc+core@1.15.0_jiti@2.6.1_postcss@8.5.6_tsx@4.20.6_typescript@5.9.3_yaml@2.8.1/node_modules/tsup/assets/esm_shims.js"() {
+  "../../node_modules/.pnpm/tsup@8.5.0_@swc+core@1.15.1_jiti@2.6.1_postcss@8.5.6_tsx@4.20.6_typescript@5.9.3_yaml@2.8.1/node_modules/tsup/assets/esm_shims.js"() {
     "use strict";
   }
 });