weapp-vite 1.5.6 → 1.6.0

package/dist/{chunk-BX3OGLVK.mjs → chunk-MVHNNHNO.mjs}

@@ -3,7 +3,7 @@ import logger from "@weapp-core/logger";
 var logger_default = logger;
 
 // package.json
-var version = "1.5.6";
+var version = "1.6.0";
 
 // src/constants.ts
 var VERSION = version;
@@ -14,7 +14,6 @@ var supportedCssLangs = ["wxss", "scss", "less", "sass", "styl"];
 import { createRequire } from "node:module";
 import process from "node:process";
 import { addExtension, defu, isObject as isObject2, objectHash, removeExtension } from "@weapp-core/shared";
-import { watch } from "chokidar";
 import fs6 from "fs-extra";
 import path5 from "pathe";
 import { build, loadConfigFromFile } from "vite";
@@ -22,15 +21,6 @@ import tsconfigPaths from "vite-tsconfig-paths";
 
 // src/defaults.ts
 var defaultExcluded = ["**/node_modules/**", "**/miniprogram_npm/**"];
-function getWeappWatchOptions() {
-  return {
-    // '**/*.{wxml,json,wxs}', '**/*.{png,jpg,jpeg,gif,svg,webp}',
-    paths: [".env", ".env.*"],
-    ignored: [
-      ...defaultExcluded
-    ]
-  };
-}
 
 // src/plugins/index.ts
 import { fdir as Fdir } from "fdir";
@@ -269,7 +259,9 @@ function vitePluginWeapp(ctx, subPackageMeta) {
         const input = getInputOption([...entriesSet]);
         options.input = input;
       },
-      async buildStart() {
+      async buildEnd() {
+        const watchFiles = this.getWatchFiles();
+        debug?.("watchFiles count: ", watchFiles.length);
         const { build: build2 } = configResolved;
         const ignore = [
           ...defaultExcluded,
@@ -391,10 +383,8 @@ function vitePluginWeapp(ctx, subPackageMeta) {
       //   console.log(id)
       // },
       // 调试监听
-      buildEnd() {
-        const watchFiles = this.getWatchFiles();
-        debug?.("watchFiles count: ", watchFiles.length);
-      },
+      // buildEnd() {
+      // },
       generateBundle(_options, bundle) {
         const bundleKeys = Object.keys(bundle);
         for (const bundleKey of bundleKeys) {
@@ -458,7 +448,6 @@ var CompilerContext = class {
   projectConfig;
   mode;
   packageJson;
-  fsWatcherMap;
   rollupWatcherMap;
   entriesSet;
   entries;
@@ -479,7 +468,6 @@ var CompilerContext = class {
     this.projectConfig = projectConfig;
     this.mode = mode;
     this.packageJson = packageJson;
-    this.fsWatcherMap = /* @__PURE__ */ new Map();
     this.rollupWatcherMap = /* @__PURE__ */ new Map();
     this.subPackageMeta = {};
     this.entriesSet = /* @__PURE__ */ new Set();
@@ -526,31 +514,7 @@ var CompilerContext = class {
       process.env.NODE_ENV = "development";
     }
     const inlineConfig = this.getConfig();
-    const getWatcher = (paths2, opts2, inlineConfig2) => {
-      const watcher2 = watch(paths2, opts2);
-      let isReady = false;
-      watcher2.on("all", async (eventName, _p) => {
-        if (isReady && (eventName === "add" || eventName === "change" || eventName === "unlink")) {
-          await this.internalDev(inlineConfig2);
-        }
-      }).on("ready", async () => {
-        await this.internalDev(inlineConfig2);
-        isReady = true;
-      });
-      return watcher2;
-    };
-    const { paths, ...opts } = defu(
-      inlineConfig.weapp?.watch,
-      {
-        ignored: [
-          path5.join(this.mpDistRoot, "**")
-        ],
-        cwd: this.cwd
-      },
-      getWeappWatchOptions()
-    );
-    const watcher = getWatcher(paths, opts, inlineConfig);
-    this.fsWatcherMap.set("/", watcher);
+    const watcher = await this.internalDev(inlineConfig);
     return watcher;
   }
   getConfig(subPackageMeta, ...configs) {
@@ -807,6 +771,9 @@ var CompilerContext = class {
     if (appEntryPath && await fs6.exists(appConfigFile)) {
       const config = await readCommentJson(appConfigFile);
       if (isObject2(config)) {
+        if (this.entriesSet.has(appEntryPath)) {
+          return;
+        }
         this.entriesSet.add(appEntryPath);
         const appEntry = {
           path: appEntryPath,

package/dist/cli.cjs

@@ -34,7 +34,7 @@ var import_vite3 = require("vite");
 var import_weapp_ide_cli = require("weapp-ide-cli");
 
 // package.json
-var version = "1.5.6";
+var version = "1.6.0";
 
 // src/constants.ts
 var VERSION = version;
@@ -45,7 +45,6 @@ var supportedCssLangs = ["wxss", "scss", "less", "sass", "styl"];
 var import_node_module = require("module");
 var import_node_process = __toESM(require("process"), 1);
 var import_shared2 = require("@weapp-core/shared");
-var import_chokidar = require("chokidar");
 var import_fs_extra6 = __toESM(require("fs-extra"), 1);
 var import_pathe5 = __toESM(require("pathe"), 1);
 var import_vite2 = require("vite");
@@ -53,15 +52,6 @@ var import_vite_tsconfig_paths = __toESM(require("vite-tsconfig-paths"), 1);
 
 // src/defaults.ts
 var defaultExcluded = ["**/node_modules/**", "**/miniprogram_npm/**"];
-function getWeappWatchOptions() {
-  return {
-    // '**/*.{wxml,json,wxs}', '**/*.{png,jpg,jpeg,gif,svg,webp}',
-    paths: [".env", ".env.*"],
-    ignored: [
-      ...defaultExcluded
-    ]
-  };
-}
 
 // src/logger.ts
 var import_logger = __toESM(require("@weapp-core/logger"), 1);
@@ -304,7 +294,9 @@ function vitePluginWeapp(ctx, subPackageMeta) {
         const input = getInputOption([...entriesSet]);
         options.input = input;
       },
-      async buildStart() {
+      async buildEnd() {
+        const watchFiles = this.getWatchFiles();
+        debug?.("watchFiles count: ", watchFiles.length);
         const { build: build2 } = configResolved;
         const ignore = [
           ...defaultExcluded,
@@ -426,10 +418,8 @@ function vitePluginWeapp(ctx, subPackageMeta) {
       //   console.log(id)
       // },
       // 调试监听
-      buildEnd() {
-        const watchFiles = this.getWatchFiles();
-        debug?.("watchFiles count: ", watchFiles.length);
-      },
+      // buildEnd() {
+      // },
       generateBundle(_options, bundle) {
         const bundleKeys = Object.keys(bundle);
         for (const bundleKey of bundleKeys) {
@@ -493,7 +483,6 @@ var CompilerContext = class {
   projectConfig;
   mode;
   packageJson;
-  fsWatcherMap;
   rollupWatcherMap;
   entriesSet;
   entries;
@@ -514,7 +503,6 @@ var CompilerContext = class {
     this.projectConfig = projectConfig;
     this.mode = mode;
     this.packageJson = packageJson;
-    this.fsWatcherMap = /* @__PURE__ */ new Map();
     this.rollupWatcherMap = /* @__PURE__ */ new Map();
     this.subPackageMeta = {};
     this.entriesSet = /* @__PURE__ */ new Set();
@@ -561,31 +549,7 @@ var CompilerContext = class {
       import_node_process.default.env.NODE_ENV = "development";
     }
     const inlineConfig = this.getConfig();
-    const getWatcher = (paths2, opts2, inlineConfig2) => {
-      const watcher2 = (0, import_chokidar.watch)(paths2, opts2);
-      let isReady = false;
-      watcher2.on("all", async (eventName, _p) => {
-        if (isReady && (eventName === "add" || eventName === "change" || eventName === "unlink")) {
-          await this.internalDev(inlineConfig2);
-        }
-      }).on("ready", async () => {
-        await this.internalDev(inlineConfig2);
-        isReady = true;
-      });
-      return watcher2;
-    };
-    const { paths, ...opts } = (0, import_shared2.defu)(
-      inlineConfig.weapp?.watch,
-      {
-        ignored: [
-          import_pathe5.default.join(this.mpDistRoot, "**")
-        ],
-        cwd: this.cwd
-      },
-      getWeappWatchOptions()
-    );
-    const watcher = getWatcher(paths, opts, inlineConfig);
-    this.fsWatcherMap.set("/", watcher);
+    const watcher = await this.internalDev(inlineConfig);
     return watcher;
   }
   getConfig(subPackageMeta, ...configs) {
@@ -842,6 +806,9 @@ var CompilerContext = class {
     if (appEntryPath && await import_fs_extra6.default.exists(appConfigFile)) {
       const config = await readCommentJson(appConfigFile);
       if ((0, import_shared2.isObject)(config)) {
+        if (this.entriesSet.has(appEntryPath)) {
+          return;
+        }
         this.entriesSet.add(appEntryPath);
         const appEntry = {
           path: appEntryPath,

package/dist/cli.mjs

@@ -2,7 +2,7 @@ import {
   VERSION,
   createCompilerContext,
   logger_default
-} from "./chunk-BX3OGLVK.mjs";
+} from "./chunk-MVHNNHNO.mjs";
 import "./chunk-444MQSSG.mjs";
 
 // src/cli.ts

package/dist/{config-C5qVlm6D.d.cts → config-C1YqV4ix.d.cts}

@@ -1,5 +1,4 @@
 import { InlineConfig, UserConfig, UserConfigFnObject, UserConfigExport } from 'vite';
-import { WatchOptions as WatchOptions$1 } from 'chokidar';
 import { PackageJson } from 'pkg-types';
 import { Options } from 'tsup';
 
@@ -23,19 +22,12 @@ interface SubPackage {
     entry?: string;
     name?: string;
 }
-interface WatchOptions extends WatchOptions$1 {
-    paths?: ReadonlyArray<string>;
-}
 interface WeappViteConfig {
     /**
      * @description 应用入口目录 (app.json 所在的目录)
      * 默认 js 模板在根目录，ts 模板在 miniprogram 目录
      */
     srcRoot?: string;
-    /**
-     * 覆盖默认 watch 行为
-     */
-    watch?: WatchOptions;
     /**
      * json 配置文件别名
      */

package/dist/{config-C5qVlm6D.d.ts → config-C1YqV4ix.d.ts}

@@ -1,5 +1,4 @@
 import { InlineConfig, UserConfig, UserConfigFnObject, UserConfigExport } from 'vite';
-import { WatchOptions as WatchOptions$1 } from 'chokidar';
 import { PackageJson } from 'pkg-types';
 import { Options } from 'tsup';
 
@@ -23,19 +22,12 @@ interface SubPackage {
     entry?: string;
     name?: string;
 }
-interface WatchOptions extends WatchOptions$1 {
-    paths?: ReadonlyArray<string>;
-}
 interface WeappViteConfig {
     /**
      * @description 应用入口目录 (app.json 所在的目录)
      * 默认 js 模板在根目录，ts 模板在 miniprogram 目录
      */
     srcRoot?: string;
-    /**
-     * 覆盖默认 watch 行为
-     */
-    watch?: WatchOptions;
     /**
      * json 配置文件别名
      */

package/dist/config.d.cts

@@ -1,5 +1,4 @@
 export { UserConfig, UserConfigExport, UserConfigFnObject } from 'vite';
-export { d as defineConfig } from './config-C5qVlm6D.cjs';
-import 'chokidar';
+export { d as defineConfig } from './config-C1YqV4ix.cjs';
 import 'pkg-types';
 import 'tsup';

package/dist/config.d.ts

@@ -1,5 +1,4 @@
 export { UserConfig, UserConfigExport, UserConfigFnObject } from 'vite';
-export { d as defineConfig } from './config-C5qVlm6D.js';
-import 'chokidar';
+export { d as defineConfig } from './config-C1YqV4ix.js';
 import 'pkg-types';
 import 'tsup';

package/dist/index.cjs

@@ -43,7 +43,6 @@ var importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
 var import_node_module = require("module");
 var import_node_process = __toESM(require("process"), 1);
 var import_shared2 = require("@weapp-core/shared");
-var import_chokidar = require("chokidar");
 var import_fs_extra6 = __toESM(require("fs-extra"), 1);
 var import_pathe5 = __toESM(require("pathe"), 1);
 var import_vite2 = require("vite");
@@ -51,15 +50,6 @@ var import_vite_tsconfig_paths = __toESM(require("vite-tsconfig-paths"), 1);
 
 // src/defaults.ts
 var defaultExcluded = ["**/node_modules/**", "**/miniprogram_npm/**"];
-function getWeappWatchOptions() {
-  return {
-    // '**/*.{wxml,json,wxs}', '**/*.{png,jpg,jpeg,gif,svg,webp}',
-    paths: [".env", ".env.*"],
-    ignored: [
-      ...defaultExcluded
-    ]
-  };
-}
 
 // src/logger.ts
 var import_logger = __toESM(require("@weapp-core/logger"), 1);
@@ -306,7 +296,9 @@ function vitePluginWeapp(ctx, subPackageMeta) {
         const input = getInputOption([...entriesSet]);
         options.input = input;
       },
-      async buildStart() {
+      async buildEnd() {
+        const watchFiles = this.getWatchFiles();
+        debug?.("watchFiles count: ", watchFiles.length);
         const { build: build2 } = configResolved;
         const ignore = [
           ...defaultExcluded,
@@ -428,10 +420,8 @@ function vitePluginWeapp(ctx, subPackageMeta) {
       //   console.log(id)
       // },
       // 调试监听
-      buildEnd() {
-        const watchFiles = this.getWatchFiles();
-        debug?.("watchFiles count: ", watchFiles.length);
-      },
+      // buildEnd() {
+      // },
       generateBundle(_options, bundle) {
         const bundleKeys = Object.keys(bundle);
         for (const bundleKey of bundleKeys) {
@@ -495,7 +485,6 @@ var CompilerContext = class {
   projectConfig;
   mode;
   packageJson;
-  fsWatcherMap;
   rollupWatcherMap;
   entriesSet;
   entries;
@@ -516,7 +505,6 @@ var CompilerContext = class {
     this.projectConfig = projectConfig;
     this.mode = mode;
     this.packageJson = packageJson;
-    this.fsWatcherMap = /* @__PURE__ */ new Map();
     this.rollupWatcherMap = /* @__PURE__ */ new Map();
     this.subPackageMeta = {};
     this.entriesSet = /* @__PURE__ */ new Set();
@@ -563,31 +551,7 @@ var CompilerContext = class {
       import_node_process.default.env.NODE_ENV = "development";
     }
     const inlineConfig = this.getConfig();
-    const getWatcher = (paths2, opts2, inlineConfig2) => {
-      const watcher2 = (0, import_chokidar.watch)(paths2, opts2);
-      let isReady = false;
-      watcher2.on("all", async (eventName, _p) => {
-        if (isReady && (eventName === "add" || eventName === "change" || eventName === "unlink")) {
-          await this.internalDev(inlineConfig2);
-        }
-      }).on("ready", async () => {
-        await this.internalDev(inlineConfig2);
-        isReady = true;
-      });
-      return watcher2;
-    };
-    const { paths, ...opts } = (0, import_shared2.defu)(
-      inlineConfig.weapp?.watch,
-      {
-        ignored: [
-          import_pathe5.default.join(this.mpDistRoot, "**")
-        ],
-        cwd: this.cwd
-      },
-      getWeappWatchOptions()
-    );
-    const watcher = getWatcher(paths, opts, inlineConfig);
-    this.fsWatcherMap.set("/", watcher);
+    const watcher = await this.internalDev(inlineConfig);
     return watcher;
   }
   getConfig(subPackageMeta, ...configs) {
@@ -844,6 +808,9 @@ var CompilerContext = class {
     if (appEntryPath && await import_fs_extra6.default.exists(appConfigFile)) {
       const config = await readCommentJson(appConfigFile);
       if ((0, import_shared2.isObject)(config)) {
+        if (this.entriesSet.has(appEntryPath)) {
+          return;
+        }
         this.entriesSet.add(appEntryPath);
         const appEntry = {
           path: appEntryPath,

package/dist/index.d.cts

@@ -1,7 +1,6 @@
-import { FSWatcher } from 'chokidar';
 import { PackageJson } from 'pkg-types';
-import { RollupOutput, RollupWatcher } from 'rollup';
-import { P as ProjectConfig, E as Entry, A as AppEntry, S as SubPackageMetaValue, R as ResolvedAlias, C as CompilerContextOptions } from './config-C5qVlm6D.cjs';
+import { RollupWatcher, RollupOutput } from 'rollup';
+import { P as ProjectConfig, E as Entry, A as AppEntry, S as SubPackageMetaValue, R as ResolvedAlias, C as CompilerContextOptions } from './config-C1YqV4ix.cjs';
 import { InlineConfig } from 'vite';
 import { Options } from 'tsup';
 
@@ -15,7 +14,6 @@ declare class CompilerContext {
     projectConfig: ProjectConfig;
     mode: string;
     packageJson: PackageJson;
-    private fsWatcherMap;
     private rollupWatcherMap;
     entriesSet: Set<string>;
     entries: Entry[];
@@ -32,7 +30,7 @@ declare class CompilerContext {
      */
     get mpDistRoot(): string | undefined;
     private internalDev;
-    runDev(): Promise<FSWatcher>;
+    runDev(): Promise<RollupWatcher>;
     getConfig(subPackageMeta?: SubPackageMetaValue, ...configs: Partial<InlineConfig>[]): InlineConfig;
     runProd(): Promise<RollupOutput | RollupOutput[]>;
     build(): Promise<void>;

package/dist/index.d.ts

@@ -1,7 +1,6 @@
-import { FSWatcher } from 'chokidar';
 import { PackageJson } from 'pkg-types';
-import { RollupOutput, RollupWatcher } from 'rollup';
-import { P as ProjectConfig, E as Entry, A as AppEntry, S as SubPackageMetaValue, R as ResolvedAlias, C as CompilerContextOptions } from './config-C5qVlm6D.js';
+import { RollupWatcher, RollupOutput } from 'rollup';
+import { P as ProjectConfig, E as Entry, A as AppEntry, S as SubPackageMetaValue, R as ResolvedAlias, C as CompilerContextOptions } from './config-C1YqV4ix.js';
 import { InlineConfig } from 'vite';
 import { Options } from 'tsup';
 
@@ -15,7 +14,6 @@ declare class CompilerContext {
     projectConfig: ProjectConfig;
     mode: string;
     packageJson: PackageJson;
-    private fsWatcherMap;
     private rollupWatcherMap;
     entriesSet: Set<string>;
     entries: Entry[];
@@ -32,7 +30,7 @@ declare class CompilerContext {
      */
     get mpDistRoot(): string | undefined;
     private internalDev;
-    runDev(): Promise<FSWatcher>;
+    runDev(): Promise<RollupWatcher>;
     getConfig(subPackageMeta?: SubPackageMetaValue, ...configs: Partial<InlineConfig>[]): InlineConfig;
     runProd(): Promise<RollupOutput | RollupOutput[]>;
     build(): Promise<void>;

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import {
   CompilerContext,
   createCompilerContext
-} from "./chunk-BX3OGLVK.mjs";
+} from "./chunk-MVHNNHNO.mjs";
 import "./chunk-444MQSSG.mjs";
 export {
   CompilerContext,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-vite",
   "type": "module",
-  "version": "1.5.6",
+  "version": "1.6.0",
   "description": "weapp-vite 一个现代化的小程序打包工具",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -52,7 +52,6 @@
   },
   "dependencies": {
     "cac": "^6.7.14",
-    "chokidar": "^3.6.0",
     "comment-json": "^4.2.5",
     "debug": "^4.3.7",
     "fdir": "^6.4.0",
@@ -63,10 +62,10 @@
     "tsup": "^8.3.0",
     "vite-tsconfig-paths": "^5.0.1",
     "@weapp-core/init": "^1.1.2",
-    "@weapp-core/logger": "^1.0.1",
     "@weapp-core/schematics": "^1.0.1",
-    "weapp-ide-cli": "^2.0.6",
-    "@weapp-core/shared": "^1.0.3"
+    "@weapp-core/shared": "^1.0.3",
+    "@weapp-core/logger": "^1.0.1",
+    "weapp-ide-cli": "^2.0.6"
   },
   "publishConfig": {
     "access": "public",