weapp-vite 1.9.2 → 2.0.0

package/dist/cli.mjs

@@ -2,11 +2,12 @@ import {
   VERSION,
   createCompilerContext,
   logger_default
-} from "./chunk-I36YQNJ7.mjs";
-import "./chunk-2FYXPWJ7.mjs";
+} from "./chunk-EO33M7LR.mjs";
+import "./chunk-5E4BX2PC.mjs";
 import {
+  __name,
   init_esm_shims
-} from "./chunk-WKC6OQ3Q.mjs";
+} from "./chunk-3HVIVQUO.mjs";
 
 // src/cli.ts
 init_esm_shims();
@@ -27,6 +28,7 @@ import path from "pathe";
 function composePath(outDir, filename) {
   return `${outDir}${outDir ? "/" : ""}${filename}`;
 }
+__name(composePath, "composePath");
 var defaultExtensions = {
   js: "js",
   json: "json",
@@ -36,6 +38,7 @@ var defaultExtensions = {
 function resolveExtension(extension) {
   return extension ? extension.startsWith(".") ? extension : `.${extension}` : "";
 }
+__name(resolveExtension, "resolveExtension");
 async function generate(options) {
   let { fileName, outDir, extensions, type, cwd } = defu(options, {
     // fileName: 'index',
@@ -49,7 +52,11 @@ async function generate(options) {
     fileName = path.basename(outDir);
   }
   const basepath = path.resolve(cwd, outDir);
-  const targetFileTypes = ["js", "wxss", "json"];
+  const targetFileTypes = [
+    "js",
+    "wxss",
+    "json"
+  ];
   if (type !== "app") {
     targetFileTypes.push("wxml");
   }
@@ -80,8 +87,10 @@ async function generate(options) {
     }
   }
 }
+__name(generate, "generate");
 
 // src/cli.ts
+import "reflect-metadata";
 var cli = cac("weapp-vite");
 function loadConfig() {
   return loadConfigFromFile({
@@ -89,6 +98,7 @@ function loadConfig() {
     mode: "development"
   }, void 0, process2.cwd());
 }
+__name(loadConfig, "loadConfig");
 var logBuildAppFinishOnlyShowOnce = false;
 function logBuildAppFinish() {
   if (!logBuildAppFinishOnlyShowOnce) {
@@ -98,6 +108,7 @@ function logBuildAppFinish() {
     logBuildAppFinishOnlyShowOnce = true;
   }
 }
+__name(logBuildAppFinish, "logBuildAppFinish");
 function filterDuplicateOptions(options) {
   for (const [key, value] of Object.entries(options)) {
     if (Array.isArray(value)) {
@@ -105,56 +116,57 @@ function filterDuplicateOptions(options) {
     }
   }
 }
+__name(filterDuplicateOptions, "filterDuplicateOptions");
 function convertBase(v) {
   if (v === 0) {
     return "";
   }
   return v;
 }
+__name(convertBase, "convertBase");
 async function openIde() {
   try {
-    await parse(["open", "-p"]);
+    await parse([
+      "open",
+      "-p"
+    ]);
   } catch (error) {
     logger_default.error(error);
   }
 }
+__name(openIde, "openIde");
 cli.option("-c, --config <file>", `[string] use specified config file`).option("--base <path>", `[string] public base path (default: /)`, {
-  type: [convertBase]
+  type: [
+    convertBase
+  ]
 }).option("-l, --logLevel <level>", `[string] info | warn | error | silent`).option("--clearScreen", `[boolean] allow/disable clear screen when logging`).option("-d, --debug [feat]", `[string | boolean] show debug logs`).option("-f, --filter <filter>", `[string] filter debug logs`).option("-m, --mode <mode>", `[string] set env mode`);
 cli.command("[root]", "start dev server").alias("serve").alias("dev").option("--skipNpm", `[boolean] if skip npm build`).option("-o, --open", `[boolean] open ide`).action(async (root, options) => {
   filterDuplicateOptions(options);
-  const ctx = await createCompilerContext({
+  const { buildService, npmService } = await createCompilerContext({
     cwd: root,
     mode: options.mode,
     isDev: true
   });
-  await ctx.build();
+  await buildService.build();
   if (!options.skipNpm) {
-    await ctx.buildNpm(void 0, { sourcemap: true });
+    await npmService.build(void 0, {
+      sourcemap: true
+    });
   }
   logBuildAppFinish();
   if (options.open) {
     await openIde();
   }
 });
-cli.command("build [root]", "build for production").option("--target <target>", `[string] transpile target (default: 'modules')`).option("--outDir <dir>", `[string] output directory (default: dist)`).option(
-  "--sourcemap [output]",
-  `[boolean | "inline" | "hidden"] output source maps for build (default: false)`
-).option(
-  "--minify [minifier]",
-  `[boolean | "terser" | "esbuild"] enable/disable minification, or specify minifier to use (default: esbuild)`
-).option(
-  "--emptyOutDir",
-  `[boolean] force empty outDir when it's outside of root`
-).option("-w, --watch", `[boolean] rebuilds when modules have changed on disk`).option("--skipNpm", `[boolean] if skip npm build`).option("-o, --open", `[boolean] open ide`).action(async (root, options) => {
+cli.command("build [root]", "build for production").option("--target <target>", `[string] transpile target (default: 'modules')`).option("--outDir <dir>", `[string] output directory (default: dist)`).option("--sourcemap [output]", `[boolean | "inline" | "hidden"] output source maps for build (default: false)`).option("--minify [minifier]", `[boolean | "terser" | "esbuild"] enable/disable minification, or specify minifier to use (default: esbuild)`).option("--emptyOutDir", `[boolean] force empty outDir when it's outside of root`).option("-w, --watch", `[boolean] rebuilds when modules have changed on disk`).option("--skipNpm", `[boolean] if skip npm build`).option("-o, --open", `[boolean] open ide`).action(async (root, options) => {
   filterDuplicateOptions(options);
-  const ctx = await createCompilerContext({
+  const { buildService, npmService } = await createCompilerContext({
     cwd: root,
     mode: options.mode
   });
-  await ctx.build();
+  await buildService.build();
   if (!options.skipNpm) {
-    await ctx.buildNpm();
+    await npmService.build();
   }
   logBuildAppFinish();
   if (options.open) {
@@ -175,7 +187,10 @@ cli.command("open").action(async () => {
 });
 cli.command("npm").alias("build:npm").alias("build-npm").action(async () => {
   try {
-    await parse(["build-npm", "-p"]);
+    await parse([
+      "build-npm",
+      "-p"
+    ]);
   } catch (error) {
     logger_default.error(error);
   }

package/dist/{config-YkkDB5_Y.d.ts → config-BM_dhf8V.d.ts}

@@ -1,9 +1,34 @@
-import { InlineConfig, UserConfig, UserConfigFnObject, UserConfigExport } from 'vite';
-import { Theme, Sitemap, App, Page, Component } from '@weapp-core/schematics';
-import { PackageJson } from 'pkg-types';
+import { UserConfig, UserConfigFnObject, UserConfigExport } from 'vite';
+import { a as Resolver } from './types-dS68tjL6.js';
 import { Options } from 'tsup';
 import { PluginOptions } from 'vite-tsconfig-paths';
-import { a as Resolver } from './types-dS68tjL6.js';
+import { Theme, Sitemap, App, Page, Component } from '@weapp-core/schematics';
+
+interface BaseEntry {
+    path: string;
+    jsonPath?: string;
+    json?: object;
+    type: 'app' | 'page' | 'component' | (string & {});
+}
+type Entry = AppEntry | PageEntry | ComponentEntry;
+interface AppEntry extends BaseEntry {
+    type: 'app';
+    themeJsonPath?: string;
+    themeJson?: Theme;
+    sitemapJsonPath?: string;
+    sitemapJson?: Sitemap;
+    json?: App;
+}
+interface PageEntry extends BaseEntry {
+    type: 'page';
+    templatePath: string;
+    json?: Page;
+}
+interface ComponentEntry extends BaseEntry {
+    type: 'component';
+    templatePath: string;
+    json?: Component;
+}
 
 interface Alias {
     find: string | RegExp;
@@ -63,21 +88,20 @@ interface AutoImportComponents {
     globs?: string[];
     resolvers?: Resolver[];
 }
-interface ScanComponentItem {
-    start: number;
-    end: number;
-}
-type ComponentsMap = Record<string, ScanComponentItem[]>;
-interface ProcessWxmlOptions {
+type EnhanceWxmlOptions = ScanWxmlOptions & HandleWxmlOptions;
+interface ScanWxmlOptions {
     excludeComponent?: (tagName: string) => boolean;
     platform?: MpPlatform;
+}
+interface HandleWxmlOptions {
     removeComment?: boolean;
+    transformEvent?: boolean;
 }
 interface EnhanceOptions {
     /**
      * wxml 增强
      */
-    wxml?: boolean | (Partial<Pick<ProcessWxmlOptions, 'removeComment' | 'excludeComponent'>>);
+    wxml?: boolean | (Partial<Omit<EnhanceWxmlOptions, 'platform'>>);
     /**
      * wxs 增强
      */
@@ -128,6 +152,12 @@ interface WeappViteConfig {
      * 默认情况下包括大部分的图片资源格式
      */
     copy?: CopyOptions;
+    /**
+     * 是否把扫描到的 wxml 添加到额外的 wxml 文件列表, 输出到最终的产物中
+     * @param wxmlFilePath
+     * @returns
+     */
+    isAdditionalWxml?: (wxmlFilePath: string) => boolean;
     /**
      * 编译目标平台
      */
@@ -137,31 +167,6 @@ interface WeappViteConfig {
      */
     enhance?: EnhanceOptions;
 }
-interface BaseEntry {
-    path: string;
-    jsonPath?: string;
-    json?: object;
-    type: 'app' | 'page' | 'component' | (string & {});
-}
-type Entry = AppEntry | PageEntry | ComponentEntry;
-interface AppEntry extends BaseEntry {
-    type: 'app';
-    themeJsonPath?: string;
-    themeJson?: Theme;
-    sitemapJsonPath?: string;
-    sitemapJson?: Sitemap;
-    json?: App;
-}
-interface PageEntry extends BaseEntry {
-    type: 'page';
-    templatePath: string;
-    json?: Page;
-}
-interface ComponentEntry extends BaseEntry {
-    type: 'component';
-    templatePath: string;
-    json?: Component;
-}
 interface ProjectConfig {
     miniprogramRoot?: string;
     srcMiniprogramRoot?: string;
@@ -173,15 +178,6 @@ interface ProjectConfig {
         }[];
     };
 }
-interface CompilerContextOptions {
-    cwd: string;
-    inlineConfig?: InlineConfig;
-    isDev?: boolean;
-    projectConfig?: ProjectConfig;
-    mode?: string;
-    packageJson?: PackageJson;
-    platform?: MpPlatform;
-}
 interface SubPackageMetaValue {
     entriesSet: Set<string>;
     entries: Entry[];
@@ -198,4 +194,4 @@ declare function defineConfig(config: Promise<UserConfig>): Promise<UserConfig>;
 declare function defineConfig(config: UserConfigFnObject): UserConfigFnObject;
 declare function defineConfig(config: UserConfigExport): UserConfigExport;
 
-export { type AppEntry as A, type CompilerContextOptions as C, type Entry as E, type MpPlatform as M, type ProjectConfig as P, type ResolvedAlias as R, type SubPackageMetaValue as S, type ComponentsMap as a, type SubPackage as b, defineConfig as d };
+export { type AppEntry as A, type Entry as E, type MpPlatform as M, type ProjectConfig as P, type ResolvedAlias as R, type SubPackageMetaValue as S, type SubPackage as a, type ScanWxmlOptions as b, defineConfig as d };

package/dist/{config-D__5C2s3.d.cts → config-DYSwq1ku.d.cts}

@@ -1,9 +1,34 @@
-import { InlineConfig, UserConfig, UserConfigFnObject, UserConfigExport } from 'vite';
-import { Theme, Sitemap, App, Page, Component } from '@weapp-core/schematics';
-import { PackageJson } from 'pkg-types';
+import { UserConfig, UserConfigFnObject, UserConfigExport } from 'vite';
+import { a as Resolver } from './types-dS68tjL6.cjs';
 import { Options } from 'tsup';
 import { PluginOptions } from 'vite-tsconfig-paths';
-import { a as Resolver } from './types-dS68tjL6.cjs';
+import { Theme, Sitemap, App, Page, Component } from '@weapp-core/schematics';
+
+interface BaseEntry {
+    path: string;
+    jsonPath?: string;
+    json?: object;
+    type: 'app' | 'page' | 'component' | (string & {});
+}
+type Entry = AppEntry | PageEntry | ComponentEntry;
+interface AppEntry extends BaseEntry {
+    type: 'app';
+    themeJsonPath?: string;
+    themeJson?: Theme;
+    sitemapJsonPath?: string;
+    sitemapJson?: Sitemap;
+    json?: App;
+}
+interface PageEntry extends BaseEntry {
+    type: 'page';
+    templatePath: string;
+    json?: Page;
+}
+interface ComponentEntry extends BaseEntry {
+    type: 'component';
+    templatePath: string;
+    json?: Component;
+}
 
 interface Alias {
     find: string | RegExp;
@@ -63,21 +88,20 @@ interface AutoImportComponents {
     globs?: string[];
     resolvers?: Resolver[];
 }
-interface ScanComponentItem {
-    start: number;
-    end: number;
-}
-type ComponentsMap = Record<string, ScanComponentItem[]>;
-interface ProcessWxmlOptions {
+type EnhanceWxmlOptions = ScanWxmlOptions & HandleWxmlOptions;
+interface ScanWxmlOptions {
     excludeComponent?: (tagName: string) => boolean;
     platform?: MpPlatform;
+}
+interface HandleWxmlOptions {
     removeComment?: boolean;
+    transformEvent?: boolean;
 }
 interface EnhanceOptions {
     /**
      * wxml 增强
      */
-    wxml?: boolean | (Partial<Pick<ProcessWxmlOptions, 'removeComment' | 'excludeComponent'>>);
+    wxml?: boolean | (Partial<Omit<EnhanceWxmlOptions, 'platform'>>);
     /**
      * wxs 增强
      */
@@ -128,6 +152,12 @@ interface WeappViteConfig {
      * 默认情况下包括大部分的图片资源格式
      */
     copy?: CopyOptions;
+    /**
+     * 是否把扫描到的 wxml 添加到额外的 wxml 文件列表, 输出到最终的产物中
+     * @param wxmlFilePath
+     * @returns
+     */
+    isAdditionalWxml?: (wxmlFilePath: string) => boolean;
     /**
      * 编译目标平台
      */
@@ -137,31 +167,6 @@ interface WeappViteConfig {
      */
     enhance?: EnhanceOptions;
 }
-interface BaseEntry {
-    path: string;
-    jsonPath?: string;
-    json?: object;
-    type: 'app' | 'page' | 'component' | (string & {});
-}
-type Entry = AppEntry | PageEntry | ComponentEntry;
-interface AppEntry extends BaseEntry {
-    type: 'app';
-    themeJsonPath?: string;
-    themeJson?: Theme;
-    sitemapJsonPath?: string;
-    sitemapJson?: Sitemap;
-    json?: App;
-}
-interface PageEntry extends BaseEntry {
-    type: 'page';
-    templatePath: string;
-    json?: Page;
-}
-interface ComponentEntry extends BaseEntry {
-    type: 'component';
-    templatePath: string;
-    json?: Component;
-}
 interface ProjectConfig {
     miniprogramRoot?: string;
     srcMiniprogramRoot?: string;
@@ -173,15 +178,6 @@ interface ProjectConfig {
         }[];
     };
 }
-interface CompilerContextOptions {
-    cwd: string;
-    inlineConfig?: InlineConfig;
-    isDev?: boolean;
-    projectConfig?: ProjectConfig;
-    mode?: string;
-    packageJson?: PackageJson;
-    platform?: MpPlatform;
-}
 interface SubPackageMetaValue {
     entriesSet: Set<string>;
     entries: Entry[];
@@ -198,4 +194,4 @@ declare function defineConfig(config: Promise<UserConfig>): Promise<UserConfig>;
 declare function defineConfig(config: UserConfigFnObject): UserConfigFnObject;
 declare function defineConfig(config: UserConfigExport): UserConfigExport;
 
-export { type AppEntry as A, type CompilerContextOptions as C, type Entry as E, type MpPlatform as M, type ProjectConfig as P, type ResolvedAlias as R, type SubPackageMetaValue as S, type ComponentsMap as a, type SubPackage as b, defineConfig as d };
+export { type AppEntry as A, type Entry as E, type MpPlatform as M, type ProjectConfig as P, type ResolvedAlias as R, type SubPackageMetaValue as S, type SubPackage as a, type ScanWxmlOptions as b, defineConfig as d };

package/dist/config.cjs

@@ -3,6 +3,7 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -26,6 +27,7 @@ module.exports = __toCommonJS(config_exports);
 function defineConfig(config) {
   return config;
 }
+__name(defineConfig, "defineConfig");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   defineConfig

package/dist/config.d.cts

@@ -1,7 +1,6 @@
 export { UserConfig, UserConfigExport, UserConfigFnObject } from 'vite';
-export { d as defineConfig } from './config-D__5C2s3.cjs';
-import '@weapp-core/schematics';
-import 'pkg-types';
+export { d as defineConfig } from './config-DYSwq1ku.cjs';
+import './types-dS68tjL6.cjs';
 import 'tsup';
 import 'vite-tsconfig-paths';
-import './types-dS68tjL6.cjs';
+import '@weapp-core/schematics';

package/dist/config.d.ts

@@ -1,7 +1,6 @@
 export { UserConfig, UserConfigExport, UserConfigFnObject } from 'vite';
-export { d as defineConfig } from './config-YkkDB5_Y.js';
-import '@weapp-core/schematics';
-import 'pkg-types';
+export { d as defineConfig } from './config-BM_dhf8V.js';
+import './types-dS68tjL6.js';
 import 'tsup';
 import 'vite-tsconfig-paths';
-import './types-dS68tjL6.js';
+import '@weapp-core/schematics';

package/dist/config.mjs

@@ -1,7 +1,7 @@
 import {
   defineConfig
-} from "./chunk-2FYXPWJ7.mjs";
-import "./chunk-WKC6OQ3Q.mjs";
+} from "./chunk-5E4BX2PC.mjs";
+import "./chunk-3HVIVQUO.mjs";
 export {
   defineConfig
 };