@univa/core 0.0.9 → 0.1.0

package/dist/global.d.ts

@@ -2,3 +2,4 @@
 /// <reference types="vite/client" />
 /// <reference types="@uni-helper/vite-plugin-uni-pages/client" />
 /// <reference types="@uni-helper/uni-types" />
+/// <reference types="@uni-ku/bundle-optimizer/client" />

package/dist/index.cjs

@@ -31,7 +31,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   AutoImport: () => import_vite4.default,
-  PageContext: () => import_vite_plugin_uni_pages2.PageContext,
   UniKuRoot: () => import_root2.default,
   Univa: () => plugins_default,
   VitePluginUniComponents: () => import_vite_plugin_uni_components3.default,
@@ -42,7 +41,7 @@ __export(index_exports, {
   defineConfig: () => defineConfig,
   kebabCase: () => import_vite_plugin_uni_components2.kebabCase,
   pascalCase: () => import_vite_plugin_uni_components2.pascalCase,
-  presetUni: () => import_unocss_preset_uni.presetUni
+  presetUni: () => import_unocss_preset_uni2.presetUni
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -55,14 +54,17 @@ function defineConfig(config) {
 var import_plugin_uni = __toESM(require("@uni-helper/plugin-uni"), 1);
 var import_vite_plugin_uni_components = __toESM(require("@uni-helper/vite-plugin-uni-components"), 1);
 var import_vite_plugin_uni_layouts = require("@uni-helper/vite-plugin-uni-layouts");
+var import_bundle_optimizer = __toESM(require("@uni-ku/bundle-optimizer"), 1);
 var import_root = __toESM(require("@uni-ku/root"), 1);
-var import_vite2 = __toESM(require("unocss/vite"), 1);
 var import_vite3 = __toESM(require("unplugin-auto-import/vite"), 1);
+var import_vite_plugin_uni_polyfill = __toESM(require("vite-plugin-uni-polyfill"), 1);
 
 // src/constant.ts
 var ID = "univa";
 var UNIVA_DIR_NAME = `.${ID}`;
 var ROOT_NAME = `${ID}.root`;
+var COMPONENTS_ASYNC_DIR_NAME = "components-async";
+var SUB_PACKAGE_DIR_NAME = "app";
 
 // src/utils/fs.ts
 var import_node_fs = require("fs");
@@ -80,6 +82,21 @@ function ensureUnivaDir(cwd) {
   ensureDir(dir);
   return dir;
 }
+function getSubDirectories(dirPath) {
+  if (!(0, import_node_fs.existsSync)(dirPath)) {
+    return [];
+  }
+  const entries = (0, import_node_fs.readdirSync)(dirPath);
+  return entries.filter((entry) => {
+    const fullPath = (0, import_node_path.join)(dirPath, entry);
+    return (0, import_node_fs.statSync)(fullPath).isDirectory();
+  });
+}
+function scanSubPackages(srcDir, subPackageRoot) {
+  const rootPath = (0, import_node_path.join)(srcDir, subPackageRoot);
+  const subDirs = getSubDirectories(rootPath);
+  return subDirs.map((name) => import_node_path.posix.join(subPackageRoot, name));
+}
 
 // src/utils/logger.ts
 var debugMode = false;
@@ -223,7 +240,6 @@ function generatePagesConfigContent(content) {
   void pages;
   void subPackages;
   return `// Auto-generated by @univa/core
-// \u6765\u6E90\uFF1Auniva.config.ts \u7684 pages \u5B57\u6BB5
 export default ${JSON.stringify(rest, null, 2)}
 `;
 }
@@ -243,10 +259,39 @@ function createPagesPlugin(pluginOptions) {
     dts: `${UNIVA_DIR_NAME}/uni-pages.d.ts`,
     exclude: ["**/components/**/*.*"],
     configSource: `${UNIVA_DIR_NAME}/pages-config.ts`,
+    onAfterMergePageMetaData: (ctx) => {
+      normalizePageNames(ctx);
+    },
     ...pluginOptions
   });
   return Array.isArray(result) ? result : [result];
 }
+function pathToPascalCase(path) {
+  if (!path) {
+    return "";
+  }
+  return path.split(/[/.-]/).filter(Boolean).map((str) => str.charAt(0).toUpperCase() + str.slice(1)).join("");
+}
+function normalizePageNames(pageContext) {
+  pageContext.pageMetaData.forEach((page) => {
+    if (page.name) {
+      return;
+    }
+    page.name = pathToPascalCase(page.path);
+  });
+  pageContext.subPageMetaData.forEach((subPage) => {
+    subPage.pages.forEach((page) => {
+      if (subPage.root.startsWith(COMPONENTS_ASYNC_DIR_NAME)) {
+        page.layout = false;
+      }
+      if (page.name) {
+        return;
+      }
+      const fullPath = [subPage.root, page.path].filter(Boolean).join("/");
+      page.name = pathToPascalCase(fullPath);
+    });
+  });
+}
 
 // src/plugins/context.ts
 var APP_KU_VUE_TEMPLATE = `<!-- Auto-generated by @univa/core -->
@@ -389,34 +434,113 @@ export default {}
 };
 
 // src/plugins/options.ts
+var import_node_path5 = require("path");
 var DEFAULT_DIRS = {
   pages: "pages",
-  subPackages: ["pages-sub/*"],
+  subPackages: [],
   layouts: "layouts"
 };
 var DEFAULT_IMPORTS = {
-  apis: ["vue", "uni-app", "composables/**", "stores/**", "hooks/**", "constants/**"],
-  components: ["components/**", "components-biz/**"]
+  apis: ["vue", "uni-app", "composables/**", "store/**", "hooks/**", "constants/**"],
+  components: ["components", "components-biz"]
+};
+var DEFAULT_UNI_PRESET = {
+  attributify: false
 };
-function resolveOptions2(userOptions) {
+function resolveOptions2(userOptions, root) {
   const srcDir = userOptions.srcDir || "src";
+  const srcDirAbs = (0, import_node_path5.resolve)(root, srcDir);
+  const autoScanPackages = scanSubPackages(srcDirAbs, SUB_PACKAGE_DIR_NAME);
+  const autoScanCompAsyncPackages = scanSubPackages(srcDirAbs, COMPONENTS_ASYNC_DIR_NAME);
+  const userSubPackages = userOptions.dirs?.subPackages ?? [];
+  const subPackages = [...userSubPackages, ...autoScanPackages, ...autoScanCompAsyncPackages];
+  log(`autoScanPackages: ${JSON.stringify({ subPackages })}`);
   const dirs = {
     pages: userOptions.dirs?.pages ?? DEFAULT_DIRS.pages,
-    subPackages: userOptions.dirs?.subPackages ?? DEFAULT_DIRS.subPackages,
+    subPackages,
     layouts: userOptions.dirs?.layouts ?? DEFAULT_DIRS.layouts
   };
   const imports = {
     apis: userOptions.imports?.apis ?? DEFAULT_IMPORTS.apis,
     components: userOptions.imports?.components ?? DEFAULT_IMPORTS.components
   };
+  const unocss = {
+    presetLegacyCompat: userOptions.unocss?.presetLegacyCompat ?? true,
+    uniPreset: userOptions.unocss?.uniPreset ?? DEFAULT_UNI_PRESET,
+    safelist: userOptions.unocss?.safelist ?? [],
+    themeColors: userOptions.unocss?.themeColors ?? {}
+  };
   return {
     srcDir,
     dirs,
+    unocss,
     imports,
     overrides: userOptions.overrides
   };
 }
 
+// src/plugins/unocss.ts
+var import_unocss_preset_uni = require("@uni-helper/unocss-preset-uni");
+var import_preset_legacy_compat = __toESM(require("@unocss/preset-legacy-compat"), 1);
+var import_unocss = require("unocss");
+var import_vite2 = __toESM(require("unocss/vite"), 1);
+function presetUniva(userOptions) {
+  const presets = [];
+  if (userOptions.presetLegacyCompat) {
+    presets.push((0, import_preset_legacy_compat.default)({
+      commaStyleColorFunction: true,
+      legacyColorSpace: true
+    }));
+  }
+  return {
+    name: `${ID}-preset`,
+    presets: [
+      (0, import_unocss_preset_uni.presetUni)(userOptions.uniPreset),
+      (0, import_unocss.presetIcons)({
+        scale: 1.2,
+        warn: true,
+        extraProperties: {
+          "display": "inline-block",
+          "vertical-align": "middle"
+        }
+      }),
+      ...presets
+    ],
+    shortcuts: [
+      ["border-s", "border border-solid"],
+      ["wh-full", "w-full h-full"],
+      ["f-c-c", "flex justify-center items-center"],
+      ["f-col-c", "flex-col justify-center items-center"],
+      ["flex-items", "flex items-center"],
+      ["flex-justify", "flex justify-center"],
+      ["flex-col", "flex flex-col"]
+    ],
+    transformers: [(0, import_unocss.transformerDirectives)(), (0, import_unocss.transformerVariantGroup)()],
+    rules: [
+      [
+        "p-safe",
+        {
+          padding: "env(safe-area-inset-top) env(safe-area-inset-right) env(safe-area-inset-bottom) env(safe-area-inset-left)"
+        }
+      ],
+      ["pt-safe", { "padding-top": "env(safe-area-inset-top)" }],
+      ["pb-safe", { "padding-bottom": "env(safe-area-inset-bottom)" }]
+    ],
+    safelist: userOptions.safelist,
+    theme: {
+      colors: userOptions.themeColors
+    }
+  };
+}
+function createUnocssPlugin(univaOptions, unocssOptions = {}) {
+  return (0, import_vite2.default)({
+    presets: [
+      presetUniva(univaOptions)
+    ],
+    ...unocssOptions
+  });
+}
+
 // src/plugins/index.ts
 var context;
 function createCorePlugin() {
@@ -475,7 +599,7 @@ function createUnivaPlugins(resolved) {
     enabledGlobalRef: true,
     rootFileName: ROOT_NAME,
     excludePages: [
-      "components-async/**/*.*"
+      `${COMPONENTS_ASYNC_DIR_NAME}/**/*.*`
     ],
     ...resolved.overrides?.root
   }));
@@ -490,7 +614,13 @@ function createUnivaPlugins(resolved) {
     ...resolved.overrides?.manifest
   }));
   plugins.push(...(0, import_plugin_uni.default)());
-  plugins.push(...(0, import_vite2.default)());
+  plugins.push((0, import_vite_plugin_uni_polyfill.default)());
+  plugins.push(createUnocssPlugin(resolved.unocss, resolved.overrides?.unocss));
+  plugins.push((0, import_bundle_optimizer.default)({
+    enable: true,
+    logger: resolved.debug,
+    ...resolved.overrides?.optimization
+  }));
   const { presets, dirs } = resolveApiSources(resolved.imports.apis, srcDir);
   const autoImportPlugin = (0, import_vite3.default)({
     imports: presets,
@@ -513,14 +643,14 @@ function Univa() {
   context.loadUserConfigSync();
   setDebug(context.config?.debug ?? false);
   context.ensureRootComponent(`${ROOT_NAME}.vue`);
-  const resolved = resolveOptions2(context.config || {});
+  const resolved = resolveOptions2(context.config || {}, context.root);
   log("\u5DF2\u52A0\u8F7D\u914D\u7F6E\uFF1A", context.configPath || "\u9ED8\u8BA4\u914D\u7F6E");
   return createUnivaPlugins(resolved);
 }
 var plugins_default = Univa;
 
 // src/index.ts
-var import_unocss_preset_uni = require("@uni-helper/unocss-preset-uni");
+var import_unocss_preset_uni2 = require("@uni-helper/unocss-preset-uni");
 var import_vite_plugin_uni_components2 = require("@uni-helper/vite-plugin-uni-components");
 var import_vite_plugin_uni_components3 = __toESM(require("@uni-helper/vite-plugin-uni-components"), 1);
 var import_vite_plugin_uni_layouts2 = require("@uni-helper/vite-plugin-uni-layouts");
@@ -530,7 +660,6 @@ var import_vite4 = __toESM(require("unplugin-auto-import/vite"), 1);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AutoImport,
-  PageContext,
   UniKuRoot,
   Univa,
   VitePluginUniComponents,

package/dist/index.d.cts

@@ -1,14 +1,18 @@
 import { PagesConfig } from '@uni-helper/uni-pages-types';
 export { Condition, EasyCom, GlobalStyle, PageMetaDatum, PagesConfig, SubPackage, TabBar, TabBarItem } from '@uni-helper/uni-pages-types';
+import { UserUniPresetOptions } from '@uni-helper/unocss-preset-uni';
+export { UserUniPresetOptions, presetUni } from '@uni-helper/unocss-preset-uni';
 import { Options } from '@uni-helper/vite-plugin-uni-components';
 export { ComponentInfo, ComponentResolver, Options as ComponentsOptions, ResolvedOptions as ComponentsResolvedOptions, ImportInfo, default as VitePluginUniComponents, camelCase, kebabCase, pascalCase } from '@uni-helper/vite-plugin-uni-components';
 import { UserManifestConfig } from '@uni-helper/vite-plugin-uni-manifest';
 import { UserOptions } from '@uni-helper/vite-plugin-uni-pages';
 export { PageContext, PagePath, UserOptions as PagesPluginOptions, ResolvedOptions as PagesResolvedOptions, SubPageMetaDatum, VitePluginUniPages, definePage } from '@uni-helper/vite-plugin-uni-pages';
+import { OptimizationOptions } from '@uni-ku/bundle-optimizer';
+import { ConfigBase } from 'unocss';
+export { ConfigBase as UnoCSSConfigBase } from 'unocss';
 import { Options as Options$1 } from 'unplugin-auto-import/types';
 export { Options as AutoImportOptions } from 'unplugin-auto-import/types';
 import { PluginOption } from 'vite';
-export { presetUni } from '@uni-helper/unocss-preset-uni';
 export { VitePluginUniLayouts } from '@uni-helper/vite-plugin-uni-layouts';
 export { default as UniKuRoot } from '@uni-ku/root';
 export { default as AutoImport } from 'unplugin-auto-import/vite';
@@ -58,6 +62,13 @@ interface UnivaDirs {
     /** 布局目录，默认 'layouts' */
     layouts?: string;
 }
+interface UnivaUnocss {
+    /** 是否开启兼容模式，默认 false */
+    presetLegacyCompat?: boolean;
+    uniPreset?: UserUniPresetOptions;
+    safelist?: string[];
+    themeColors?: Record<string, string>;
+}
 /**
  * 自动导入配置
  */
@@ -91,6 +102,12 @@ interface ResolvedUnivaDirs {
     subPackages: string[];
     layouts: string;
 }
+interface ResolvedUnivaUnocss {
+    presetLegacyCompat: boolean;
+    uniPreset: UserUniPresetOptions;
+    safelist: string[];
+    themeColors: Record<string, string>;
+}
 /**
  * 解析后的自动导入配置（字段必填，已应用默认值）
  */
@@ -118,10 +135,7 @@ interface RootOptions {
 /**
  * UnoCSS 模块底层选项（用于 overrides）
  */
-interface UnoCSSOptions {
-    presets?: unknown[];
-    rules?: unknown[];
-    shortcuts?: Record<string, string | string[]>;
+interface UnoCSSOptions extends ConfigBase {
 }
 /**
  * 底层插件逃生口
@@ -144,6 +158,8 @@ interface UnivaOverrides {
     unocss?: UnoCSSOptions;
     /** @uni-helper/vite-plugin-uni-manifest 完整选项 */
     manifest?: UserManifestOptions;
+    /** @uni-ku/bundle-optimizer 完整选项 */
+    optimization?: OptimizationOptions;
 }
 /**
  * Univa 统一配置接口（工程级约定）
@@ -170,6 +186,7 @@ interface UnivaOptions {
     pages?: Partial<PagesConfig>;
     /** 应用级 manifest.json 配置 */
     manifest?: Partial<UserManifestConfig>;
+    unocss?: UnivaUnocss;
     /** 底层插件逃生口（覆盖融合层默认，高级用户使用） */
     overrides?: UnivaOverrides;
 }
@@ -186,6 +203,7 @@ interface ResolvedOptions extends Omit<UnivaOptions, 'dirs' | 'imports' | 'srcDi
     dirs: ResolvedUnivaDirs;
     /** 自动导入配置（已应用默认值，字段必填） */
     imports: ResolvedUnivaImports;
+    unocss: ResolvedUnivaUnocss;
 }
 
 /**
@@ -219,4 +237,4 @@ declare function createUnivaPlugins(resolved: ResolvedOptions): PluginOption[];
  */
 declare function Univa(): PluginOption[];
 
-export { type LayoutsOptions, type ResolvedOptions, type ResolvedUnivaDirs, type ResolvedUnivaImports, type RootOptions, Univa, type UnivaDirs, type UnivaImports, type UnivaOptions, type UnivaOverrides, type UnoCSSOptions, createUnivaPlugins, defineConfig };
+export { type LayoutsOptions, type ResolvedOptions, type ResolvedUnivaDirs, type ResolvedUnivaImports, type ResolvedUnivaUnocss, type RootOptions, Univa, type UnivaDirs, type UnivaImports, type UnivaOptions, type UnivaOverrides, type UnivaUnocss, type UnoCSSOptions, createUnivaPlugins, defineConfig };

package/dist/index.d.ts

@@ -1,14 +1,18 @@
 import { PagesConfig } from '@uni-helper/uni-pages-types';
 export { Condition, EasyCom, GlobalStyle, PageMetaDatum, PagesConfig, SubPackage, TabBar, TabBarItem } from '@uni-helper/uni-pages-types';
+import { UserUniPresetOptions } from '@uni-helper/unocss-preset-uni';
+export { UserUniPresetOptions, presetUni } from '@uni-helper/unocss-preset-uni';
 import { Options } from '@uni-helper/vite-plugin-uni-components';
 export { ComponentInfo, ComponentResolver, Options as ComponentsOptions, ResolvedOptions as ComponentsResolvedOptions, ImportInfo, default as VitePluginUniComponents, camelCase, kebabCase, pascalCase } from '@uni-helper/vite-plugin-uni-components';
 import { UserManifestConfig } from '@uni-helper/vite-plugin-uni-manifest';
 import { UserOptions } from '@uni-helper/vite-plugin-uni-pages';
 export { PageContext, PagePath, UserOptions as PagesPluginOptions, ResolvedOptions as PagesResolvedOptions, SubPageMetaDatum, VitePluginUniPages, definePage } from '@uni-helper/vite-plugin-uni-pages';
+import { OptimizationOptions } from '@uni-ku/bundle-optimizer';
+import { ConfigBase } from 'unocss';
+export { ConfigBase as UnoCSSConfigBase } from 'unocss';
 import { Options as Options$1 } from 'unplugin-auto-import/types';
 export { Options as AutoImportOptions } from 'unplugin-auto-import/types';
 import { PluginOption } from 'vite';
-export { presetUni } from '@uni-helper/unocss-preset-uni';
 export { VitePluginUniLayouts } from '@uni-helper/vite-plugin-uni-layouts';
 export { default as UniKuRoot } from '@uni-ku/root';
 export { default as AutoImport } from 'unplugin-auto-import/vite';
@@ -58,6 +62,13 @@ interface UnivaDirs {
     /** 布局目录，默认 'layouts' */
     layouts?: string;
 }
+interface UnivaUnocss {
+    /** 是否开启兼容模式，默认 false */
+    presetLegacyCompat?: boolean;
+    uniPreset?: UserUniPresetOptions;
+    safelist?: string[];
+    themeColors?: Record<string, string>;
+}
 /**
  * 自动导入配置
  */
@@ -91,6 +102,12 @@ interface ResolvedUnivaDirs {
     subPackages: string[];
     layouts: string;
 }
+interface ResolvedUnivaUnocss {
+    presetLegacyCompat: boolean;
+    uniPreset: UserUniPresetOptions;
+    safelist: string[];
+    themeColors: Record<string, string>;
+}
 /**
  * 解析后的自动导入配置（字段必填，已应用默认值）
  */
@@ -118,10 +135,7 @@ interface RootOptions {
 /**
  * UnoCSS 模块底层选项（用于 overrides）
  */
-interface UnoCSSOptions {
-    presets?: unknown[];
-    rules?: unknown[];
-    shortcuts?: Record<string, string | string[]>;
+interface UnoCSSOptions extends ConfigBase {
 }
 /**
  * 底层插件逃生口
@@ -144,6 +158,8 @@ interface UnivaOverrides {
     unocss?: UnoCSSOptions;
     /** @uni-helper/vite-plugin-uni-manifest 完整选项 */
     manifest?: UserManifestOptions;
+    /** @uni-ku/bundle-optimizer 完整选项 */
+    optimization?: OptimizationOptions;
 }
 /**
  * Univa 统一配置接口（工程级约定）
@@ -170,6 +186,7 @@ interface UnivaOptions {
     pages?: Partial<PagesConfig>;
     /** 应用级 manifest.json 配置 */
     manifest?: Partial<UserManifestConfig>;
+    unocss?: UnivaUnocss;
     /** 底层插件逃生口（覆盖融合层默认，高级用户使用） */
     overrides?: UnivaOverrides;
 }
@@ -186,6 +203,7 @@ interface ResolvedOptions extends Omit<UnivaOptions, 'dirs' | 'imports' | 'srcDi
     dirs: ResolvedUnivaDirs;
     /** 自动导入配置（已应用默认值，字段必填） */
     imports: ResolvedUnivaImports;
+    unocss: ResolvedUnivaUnocss;
 }
 
 /**
@@ -219,4 +237,4 @@ declare function createUnivaPlugins(resolved: ResolvedOptions): PluginOption[];
  */
 declare function Univa(): PluginOption[];
 
-export { type LayoutsOptions, type ResolvedOptions, type ResolvedUnivaDirs, type ResolvedUnivaImports, type RootOptions, Univa, type UnivaDirs, type UnivaImports, type UnivaOptions, type UnivaOverrides, type UnoCSSOptions, createUnivaPlugins, defineConfig };
+export { type LayoutsOptions, type ResolvedOptions, type ResolvedUnivaDirs, type ResolvedUnivaImports, type ResolvedUnivaUnocss, type RootOptions, Univa, type UnivaDirs, type UnivaImports, type UnivaOptions, type UnivaOverrides, type UnivaUnocss, type UnoCSSOptions, createUnivaPlugins, defineConfig };

package/dist/index.js

@@ -7,18 +7,21 @@ function defineConfig(config) {
 import Uni from "@uni-helper/plugin-uni";
 import VitePluginUniComponents from "@uni-helper/vite-plugin-uni-components";
 import { VitePluginUniLayouts } from "@uni-helper/vite-plugin-uni-layouts";
+import Optimization from "@uni-ku/bundle-optimizer";
 import UniKuRoot from "@uni-ku/root";
-import UnoCSS from "unocss/vite";
 import AutoImport from "unplugin-auto-import/vite";
+import UniPolyfill from "vite-plugin-uni-polyfill";
 
 // src/constant.ts
 var ID = "univa";
 var UNIVA_DIR_NAME = `.${ID}`;
 var ROOT_NAME = `${ID}.root`;
+var COMPONENTS_ASYNC_DIR_NAME = "components-async";
+var SUB_PACKAGE_DIR_NAME = "app";
 
 // src/utils/fs.ts
-import { existsSync, mkdirSync } from "fs";
-import { join } from "path";
+import { existsSync, mkdirSync, readdirSync, statSync } from "fs";
+import { join, posix } from "path";
 function ensureDir(dir) {
   if (!existsSync(dir)) {
     mkdirSync(dir, { recursive: true });
@@ -32,6 +35,21 @@ function ensureUnivaDir(cwd) {
   ensureDir(dir);
   return dir;
 }
+function getSubDirectories(dirPath) {
+  if (!existsSync(dirPath)) {
+    return [];
+  }
+  const entries = readdirSync(dirPath);
+  return entries.filter((entry) => {
+    const fullPath = join(dirPath, entry);
+    return statSync(fullPath).isDirectory();
+  });
+}
+function scanSubPackages(srcDir, subPackageRoot) {
+  const rootPath = join(srcDir, subPackageRoot);
+  const subDirs = getSubDirectories(rootPath);
+  return subDirs.map((name) => posix.join(subPackageRoot, name));
+}
 
 // src/utils/logger.ts
 var debugMode = false;
@@ -175,7 +193,6 @@ function generatePagesConfigContent(content) {
   void pages;
   void subPackages;
   return `// Auto-generated by @univa/core
-// \u6765\u6E90\uFF1Auniva.config.ts \u7684 pages \u5B57\u6BB5
 export default ${JSON.stringify(rest, null, 2)}
 `;
 }
@@ -195,10 +212,39 @@ function createPagesPlugin(pluginOptions) {
     dts: `${UNIVA_DIR_NAME}/uni-pages.d.ts`,
     exclude: ["**/components/**/*.*"],
     configSource: `${UNIVA_DIR_NAME}/pages-config.ts`,
+    onAfterMergePageMetaData: (ctx) => {
+      normalizePageNames(ctx);
+    },
     ...pluginOptions
   });
   return Array.isArray(result) ? result : [result];
 }
+function pathToPascalCase(path) {
+  if (!path) {
+    return "";
+  }
+  return path.split(/[/.-]/).filter(Boolean).map((str) => str.charAt(0).toUpperCase() + str.slice(1)).join("");
+}
+function normalizePageNames(pageContext) {
+  pageContext.pageMetaData.forEach((page) => {
+    if (page.name) {
+      return;
+    }
+    page.name = pathToPascalCase(page.path);
+  });
+  pageContext.subPageMetaData.forEach((subPage) => {
+    subPage.pages.forEach((page) => {
+      if (subPage.root.startsWith(COMPONENTS_ASYNC_DIR_NAME)) {
+        page.layout = false;
+      }
+      if (page.name) {
+        return;
+      }
+      const fullPath = [subPage.root, page.path].filter(Boolean).join("/");
+      page.name = pathToPascalCase(fullPath);
+    });
+  });
+}
 
 // src/plugins/context.ts
 var APP_KU_VUE_TEMPLATE = `<!-- Auto-generated by @univa/core -->
@@ -341,34 +387,113 @@ export default {}
 };
 
 // src/plugins/options.ts
+import { resolve as resolve2 } from "path";
 var DEFAULT_DIRS = {
   pages: "pages",
-  subPackages: ["pages-sub/*"],
+  subPackages: [],
   layouts: "layouts"
 };
 var DEFAULT_IMPORTS = {
-  apis: ["vue", "uni-app", "composables/**", "stores/**", "hooks/**", "constants/**"],
-  components: ["components/**", "components-biz/**"]
+  apis: ["vue", "uni-app", "composables/**", "store/**", "hooks/**", "constants/**"],
+  components: ["components", "components-biz"]
+};
+var DEFAULT_UNI_PRESET = {
+  attributify: false
 };
-function resolveOptions2(userOptions) {
+function resolveOptions2(userOptions, root) {
   const srcDir = userOptions.srcDir || "src";
+  const srcDirAbs = resolve2(root, srcDir);
+  const autoScanPackages = scanSubPackages(srcDirAbs, SUB_PACKAGE_DIR_NAME);
+  const autoScanCompAsyncPackages = scanSubPackages(srcDirAbs, COMPONENTS_ASYNC_DIR_NAME);
+  const userSubPackages = userOptions.dirs?.subPackages ?? [];
+  const subPackages = [...userSubPackages, ...autoScanPackages, ...autoScanCompAsyncPackages];
+  log(`autoScanPackages: ${JSON.stringify({ subPackages })}`);
   const dirs = {
     pages: userOptions.dirs?.pages ?? DEFAULT_DIRS.pages,
-    subPackages: userOptions.dirs?.subPackages ?? DEFAULT_DIRS.subPackages,
+    subPackages,
     layouts: userOptions.dirs?.layouts ?? DEFAULT_DIRS.layouts
   };
   const imports = {
     apis: userOptions.imports?.apis ?? DEFAULT_IMPORTS.apis,
     components: userOptions.imports?.components ?? DEFAULT_IMPORTS.components
   };
+  const unocss = {
+    presetLegacyCompat: userOptions.unocss?.presetLegacyCompat ?? true,
+    uniPreset: userOptions.unocss?.uniPreset ?? DEFAULT_UNI_PRESET,
+    safelist: userOptions.unocss?.safelist ?? [],
+    themeColors: userOptions.unocss?.themeColors ?? {}
+  };
   return {
     srcDir,
     dirs,
+    unocss,
     imports,
     overrides: userOptions.overrides
   };
 }
 
+// src/plugins/unocss.ts
+import { presetUni } from "@uni-helper/unocss-preset-uni";
+import presetLegacyCompat from "@unocss/preset-legacy-compat";
+import { presetIcons, transformerDirectives, transformerVariantGroup } from "unocss";
+import UnoCSS from "unocss/vite";
+function presetUniva(userOptions) {
+  const presets = [];
+  if (userOptions.presetLegacyCompat) {
+    presets.push(presetLegacyCompat({
+      commaStyleColorFunction: true,
+      legacyColorSpace: true
+    }));
+  }
+  return {
+    name: `${ID}-preset`,
+    presets: [
+      presetUni(userOptions.uniPreset),
+      presetIcons({
+        scale: 1.2,
+        warn: true,
+        extraProperties: {
+          "display": "inline-block",
+          "vertical-align": "middle"
+        }
+      }),
+      ...presets
+    ],
+    shortcuts: [
+      ["border-s", "border border-solid"],
+      ["wh-full", "w-full h-full"],
+      ["f-c-c", "flex justify-center items-center"],
+      ["f-col-c", "flex-col justify-center items-center"],
+      ["flex-items", "flex items-center"],
+      ["flex-justify", "flex justify-center"],
+      ["flex-col", "flex flex-col"]
+    ],
+    transformers: [transformerDirectives(), transformerVariantGroup()],
+    rules: [
+      [
+        "p-safe",
+        {
+          padding: "env(safe-area-inset-top) env(safe-area-inset-right) env(safe-area-inset-bottom) env(safe-area-inset-left)"
+        }
+      ],
+      ["pt-safe", { "padding-top": "env(safe-area-inset-top)" }],
+      ["pb-safe", { "padding-bottom": "env(safe-area-inset-bottom)" }]
+    ],
+    safelist: userOptions.safelist,
+    theme: {
+      colors: userOptions.themeColors
+    }
+  };
+}
+function createUnocssPlugin(univaOptions, unocssOptions = {}) {
+  return UnoCSS({
+    presets: [
+      presetUniva(univaOptions)
+    ],
+    ...unocssOptions
+  });
+}
+
 // src/plugins/index.ts
 var context;
 function createCorePlugin() {
@@ -427,7 +552,7 @@ function createUnivaPlugins(resolved) {
     enabledGlobalRef: true,
     rootFileName: ROOT_NAME,
     excludePages: [
-      "components-async/**/*.*"
+      `${COMPONENTS_ASYNC_DIR_NAME}/**/*.*`
     ],
     ...resolved.overrides?.root
   }));
@@ -442,7 +567,13 @@ function createUnivaPlugins(resolved) {
     ...resolved.overrides?.manifest
   }));
   plugins.push(...Uni());
-  plugins.push(...UnoCSS());
+  plugins.push(UniPolyfill());
+  plugins.push(createUnocssPlugin(resolved.unocss, resolved.overrides?.unocss));
+  plugins.push(Optimization({
+    enable: true,
+    logger: resolved.debug,
+    ...resolved.overrides?.optimization
+  }));
   const { presets, dirs } = resolveApiSources(resolved.imports.apis, srcDir);
   const autoImportPlugin = AutoImport({
     imports: presets,
@@ -465,23 +596,22 @@ function Univa() {
   context.loadUserConfigSync();
   setDebug(context.config?.debug ?? false);
   context.ensureRootComponent(`${ROOT_NAME}.vue`);
-  const resolved = resolveOptions2(context.config || {});
+  const resolved = resolveOptions2(context.config || {}, context.root);
   log("\u5DF2\u52A0\u8F7D\u914D\u7F6E\uFF1A", context.configPath || "\u9ED8\u8BA4\u914D\u7F6E");
   return createUnivaPlugins(resolved);
 }
 var plugins_default = Univa;
 
 // src/index.ts
-import { presetUni } from "@uni-helper/unocss-preset-uni";
+import { presetUni as presetUni2 } from "@uni-helper/unocss-preset-uni";
 import { camelCase, kebabCase, pascalCase } from "@uni-helper/vite-plugin-uni-components";
 import { default as default2 } from "@uni-helper/vite-plugin-uni-components";
 import { VitePluginUniLayouts as VitePluginUniLayouts2 } from "@uni-helper/vite-plugin-uni-layouts";
-import { PageContext, VitePluginUniPages as VitePluginUniPages2 } from "@uni-helper/vite-plugin-uni-pages";
+import { VitePluginUniPages as VitePluginUniPages2 } from "@uni-helper/vite-plugin-uni-pages";
 import { default as default3 } from "@uni-ku/root";
 import { default as default4 } from "unplugin-auto-import/vite";
 export {
   default4 as AutoImport,
-  PageContext,
   default3 as UniKuRoot,
   plugins_default as Univa,
   default2 as VitePluginUniComponents,
@@ -492,5 +622,5 @@ export {
   defineConfig,
   kebabCase,
   pascalCase,
-  presetUni
+  presetUni2 as presetUni
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@univa/core",
   "type": "module",
-  "version": "0.0.9",
+  "version": "0.1.0",
   "description": "🚀 开箱即用的 uni-app Vite 插件集，提供完整的开发体验",
   "author": "lianghang <libre1103@163.com>",
   "license": "MIT",
@@ -74,6 +74,7 @@
     "@uni-helper/vite-plugin-uni-layouts": "0.1.11",
     "@uni-helper/vite-plugin-uni-manifest": "0.4.1",
     "@uni-helper/vite-plugin-uni-pages": "0.4.6",
+    "@uni-ku/bundle-optimizer": "2.2.0",
     "@uni-ku/root": "1.4.1",
     "@unocss/eslint-plugin": "66.6.7",
     "@unocss/preset-legacy-compat": "66.0.0",