weapp-vite 1.2.0 → 1.2.2

package/dist/{chunk-3EHL3BIF.mjs → chunk-NP647U5Z.mjs}

@@ -1,5 +1,9 @@
+// src/logger.ts
+import logger from "@weapp-core/logger";
+var logger_default = logger;
+
 // package.json
-var version = "1.2.0";
+var version = "1.2.2";
 
 // src/constants.ts
 var VERSION = version;
@@ -46,7 +50,7 @@ function createDebugger(namespace) {
 // src/entry.ts
 import process from "node:process";
 import { defu as defu2 } from "@weapp-core/shared";
-import klaw from "klaw";
+import { fdir as Fdir } from "fdir";
 import mm from "micromatch";
 import path3 from "pathe";
 
@@ -230,21 +234,15 @@ async function getEntries(options) {
         type: "subPackageEntry"
       });
     }
-    for await (const file of klaw(
-      path3.join(root, subPackageRoot),
-      {
-        filter
-      }
-    )) {
-      if (file.stats.isFile()) {
-        if (/\.wxml$/.test(file.path)) {
-          const entry = getWxmlEntry(file.path, formatPath);
-          if (entry) {
-            if (entry.type === "component") {
-              componentEntries.push(entry);
-            } else if (entry.type === "page") {
-              pageEntries.push(entry);
-            }
+    const files = await new Fdir().withFullPaths().filter(filter).crawl(path3.join(root, subPackageRoot)).withPromise();
+    for (const file of files) {
+      if (/\.wxml$/.test(file)) {
+        const entry = getWxmlEntry(file, formatPath);
+        if (entry) {
+          if (entry.type === "component") {
+            componentEntries.push(entry);
+          } else if (entry.type === "page") {
+            pageEntries.push(entry);
           }
         }
       }
@@ -274,21 +272,15 @@ async function getEntries(options) {
       );
       const pageEntries = [];
       const componentEntries = [];
-      for await (const file of klaw(
-        path3.join(root, srcRoot),
-        {
-          filter
-        }
-      )) {
-        if (file.stats.isFile()) {
-          if (/\.wxml$/.test(file.path)) {
-            const entry = getWxmlEntry(file.path, formatPath);
-            if (entry) {
-              if (entry.type === "component") {
-                componentEntries.push(entry);
-              } else if (entry.type === "page") {
-                pageEntries.push(entry);
-              }
+      const files = await new Fdir().withFullPaths().filter(filter).crawl(path3.join(root, srcRoot)).withPromise();
+      for (const file of files) {
+        if (/\.wxml$/.test(file)) {
+          const entry = getWxmlEntry(file, formatPath);
+          if (entry) {
+            if (entry.type === "component") {
+              componentEntries.push(entry);
+            } else if (entry.type === "page") {
+              pageEntries.push(entry);
             }
           }
         }
@@ -298,7 +290,6 @@ async function getEntries(options) {
         pages: pageEntries,
         components: componentEntries,
         subPackages: subPackageDeps
-        // walkPathsSet,
       };
     }
   }
@@ -558,12 +549,6 @@ var CompilerContext = class _CompilerContext {
   get mpDistRoot() {
     return this.projectConfig.miniprogramRoot || this.projectConfig.srcMiniprogramRoot || "";
   }
-  // get weappConfig() {
-  //   return this.inlineConfig.weapp
-  // }
-  // get inlineSubPackageConfig() {
-  //   return this.weappConfig?.subPackage
-  // }
   forkSubPackage(subPackage) {
     const ctx = new _CompilerContext({
       cwd: this.cwd,
@@ -599,7 +584,9 @@ var CompilerContext = class _CompilerContext {
         mode: "development",
         plugins: [vitePluginWeapp(this)],
         build: {
-          watch: {},
+          watch: {
+            exclude: ["node_modules/**", this.mpDistRoot ? path5.join(this.mpDistRoot, "**") : "dist/**"]
+          },
           minify: false,
           emptyOutDir: false
         },
@@ -667,10 +654,24 @@ var CompilerContext = class _CompilerContext {
         }
       }
     );
-    const output = await build(
-      inlineConfig
-    );
-    return output;
+    if (this.type === "subPackage" && this.subPackage) {
+      const subPackageInlineConfig = Object.assign({}, inlineConfig, {
+        weapp: {
+          srcRoot: this.parent?.srcRoot,
+          type: this.type,
+          subPackage: this.subPackage
+        }
+      });
+      const output = await build(
+        subPackageInlineConfig
+      );
+      return output;
+    } else if (this.type === "app") {
+      const output = await build(
+        inlineConfig
+      );
+      return output;
+    }
   }
   build() {
     if (this.isDev) {
@@ -722,11 +723,9 @@ var CompilerContext = class _CompilerContext {
         commonjsOptions: {
           transformMixedEsModules: true,
           include: void 0
-        },
-        watch: {
-          exclude: ["node_modules/**", this.mpDistRoot ? path5.join(this.mpDistRoot, "**") : "dist/**"]
         }
       },
+      logLevel: "info",
       plugins: [
         tsconfigPaths()
       ],
@@ -784,11 +783,14 @@ var CompilerContext = class _CompilerContext {
                         strict: false,
                         entryFileNames: "[name].js"
                       }
+                      // logLevel: 'silent',
                     },
                     assetsDir: "."
-                  }
+                  },
+                  logLevel: "error"
                 });
               }
+              logger_default.success(`${dep} \u4F9D\u8D56\u5904\u7406\u5B8C\u6210!`);
             }
           }
         }
@@ -798,6 +800,7 @@ var CompilerContext = class _CompilerContext {
 };
 
 export {
+  logger_default,
   VERSION,
   CompilerContext
 };

package/dist/cli.cjs

@@ -33,7 +33,7 @@ var import_cac = require("cac");
 var import_weapp_ide_cli = require("weapp-ide-cli");
 
 // package.json
-var version = "1.2.0";
+var version = "1.2.2";
 
 // src/constants.ts
 var VERSION = version;
@@ -60,6 +60,10 @@ function getWeappWatchOptions() {
   };
 }
 
+// src/logger.ts
+var import_logger = __toESM(require("@weapp-core/logger"), 1);
+var logger_default = import_logger.default;
+
 // src/plugins/index.ts
 var import_shared3 = require("@weapp-core/shared");
 var import_fast_glob = __toESM(require("fast-glob"), 1);
@@ -80,7 +84,7 @@ function createDebugger(namespace) {
 // src/entry.ts
 var import_node_process = __toESM(require("process"), 1);
 var import_shared2 = require("@weapp-core/shared");
-var import_klaw = __toESM(require("klaw"), 1);
+var import_fdir = require("fdir");
 var import_micromatch = __toESM(require("micromatch"), 1);
 var import_pathe3 = __toESM(require("pathe"), 1);
 
@@ -264,21 +268,15 @@ async function getEntries(options) {
         type: "subPackageEntry"
       });
     }
-    for await (const file of (0, import_klaw.default)(
-      import_pathe3.default.join(root, subPackageRoot),
-      {
-        filter
-      }
-    )) {
-      if (file.stats.isFile()) {
-        if (/\.wxml$/.test(file.path)) {
-          const entry = getWxmlEntry(file.path, formatPath);
-          if (entry) {
-            if (entry.type === "component") {
-              componentEntries.push(entry);
-            } else if (entry.type === "page") {
-              pageEntries.push(entry);
-            }
+    const files = await new import_fdir.fdir().withFullPaths().filter(filter).crawl(import_pathe3.default.join(root, subPackageRoot)).withPromise();
+    for (const file of files) {
+      if (/\.wxml$/.test(file)) {
+        const entry = getWxmlEntry(file, formatPath);
+        if (entry) {
+          if (entry.type === "component") {
+            componentEntries.push(entry);
+          } else if (entry.type === "page") {
+            pageEntries.push(entry);
           }
         }
       }
@@ -308,21 +306,15 @@ async function getEntries(options) {
       );
       const pageEntries = [];
       const componentEntries = [];
-      for await (const file of (0, import_klaw.default)(
-        import_pathe3.default.join(root, srcRoot),
-        {
-          filter
-        }
-      )) {
-        if (file.stats.isFile()) {
-          if (/\.wxml$/.test(file.path)) {
-            const entry = getWxmlEntry(file.path, formatPath);
-            if (entry) {
-              if (entry.type === "component") {
-                componentEntries.push(entry);
-              } else if (entry.type === "page") {
-                pageEntries.push(entry);
-              }
+      const files = await new import_fdir.fdir().withFullPaths().filter(filter).crawl(import_pathe3.default.join(root, srcRoot)).withPromise();
+      for (const file of files) {
+        if (/\.wxml$/.test(file)) {
+          const entry = getWxmlEntry(file, formatPath);
+          if (entry) {
+            if (entry.type === "component") {
+              componentEntries.push(entry);
+            } else if (entry.type === "page") {
+              pageEntries.push(entry);
             }
           }
         }
@@ -332,7 +324,6 @@ async function getEntries(options) {
         pages: pageEntries,
         components: componentEntries,
         subPackages: subPackageDeps
-        // walkPathsSet,
       };
     }
   }
@@ -592,12 +583,6 @@ var CompilerContext = class _CompilerContext {
   get mpDistRoot() {
     return this.projectConfig.miniprogramRoot || this.projectConfig.srcMiniprogramRoot || "";
   }
-  // get weappConfig() {
-  //   return this.inlineConfig.weapp
-  // }
-  // get inlineSubPackageConfig() {
-  //   return this.weappConfig?.subPackage
-  // }
   forkSubPackage(subPackage) {
     const ctx = new _CompilerContext({
       cwd: this.cwd,
@@ -633,7 +618,9 @@ var CompilerContext = class _CompilerContext {
         mode: "development",
         plugins: [vitePluginWeapp(this)],
         build: {
-          watch: {},
+          watch: {
+            exclude: ["node_modules/**", this.mpDistRoot ? import_pathe5.default.join(this.mpDistRoot, "**") : "dist/**"]
+          },
           minify: false,
           emptyOutDir: false
         },
@@ -701,10 +688,24 @@ var CompilerContext = class _CompilerContext {
         }
       }
     );
-    const output = await (0, import_vite2.build)(
-      inlineConfig
-    );
-    return output;
+    if (this.type === "subPackage" && this.subPackage) {
+      const subPackageInlineConfig = Object.assign({}, inlineConfig, {
+        weapp: {
+          srcRoot: this.parent?.srcRoot,
+          type: this.type,
+          subPackage: this.subPackage
+        }
+      });
+      const output = await (0, import_vite2.build)(
+        subPackageInlineConfig
+      );
+      return output;
+    } else if (this.type === "app") {
+      const output = await (0, import_vite2.build)(
+        inlineConfig
+      );
+      return output;
+    }
   }
   build() {
     if (this.isDev) {
@@ -756,11 +757,9 @@ var CompilerContext = class _CompilerContext {
         commonjsOptions: {
           transformMixedEsModules: true,
           include: void 0
-        },
-        watch: {
-          exclude: ["node_modules/**", this.mpDistRoot ? import_pathe5.default.join(this.mpDistRoot, "**") : "dist/**"]
         }
       },
+      logLevel: "info",
       plugins: [
         (0, import_vite_tsconfig_paths.default)()
       ],
@@ -818,11 +817,14 @@ var CompilerContext = class _CompilerContext {
                         strict: false,
                         entryFileNames: "[name].js"
                       }
+                      // logLevel: 'silent',
                     },
                     assetsDir: "."
-                  }
+                  },
+                  logLevel: "error"
                 });
               }
+              logger_default.success(`${dep} \u4F9D\u8D56\u5904\u7406\u5B8C\u6210!`);
             }
           }
         }
@@ -831,10 +833,6 @@ var CompilerContext = class _CompilerContext {
   }
 };
 
-// src/logger.ts
-var import_logger = __toESM(require("@weapp-core/logger"), 1);
-var logger_default = import_logger.default;
-
 // src/cli.ts
 var cli = (0, import_cac.cac)("weapp-vite");
 function filterDuplicateOptions(options) {
@@ -880,8 +878,8 @@ cli.command("build [root]", "build for production").option("--target <target>",
     mode: options.mode
   });
   await ctx.loadDefaultConfig();
-  await ctx.buildNpm();
   await ctx.runProd();
+  await ctx.buildNpm();
 });
 cli.command("init").action(() => {
   try {

package/dist/cli.mjs

@@ -1,7 +1,8 @@
 import {
   CompilerContext,
-  VERSION
-} from "./chunk-3EHL3BIF.mjs";
+  VERSION,
+  logger_default
+} from "./chunk-NP647U5Z.mjs";
 import "./chunk-444MQSSG.mjs";
 
 // src/cli.ts
@@ -9,12 +10,6 @@ import process from "node:process";
 import { initConfig } from "@weapp-core/init";
 import { cac } from "cac";
 import { parse } from "weapp-ide-cli";
-
-// src/logger.ts
-import logger from "@weapp-core/logger";
-var logger_default = logger;
-
-// src/cli.ts
 var cli = cac("weapp-vite");
 function filterDuplicateOptions(options) {
   for (const [key, value] of Object.entries(options)) {
@@ -59,8 +54,8 @@ cli.command("build [root]", "build for production").option("--target <target>",
     mode: options.mode
   });
   await ctx.loadDefaultConfig();
-  await ctx.buildNpm();
   await ctx.runProd();
+  await ctx.buildNpm();
 });
 cli.command("init").action(() => {
   try {

package/dist/index.cjs

@@ -59,6 +59,10 @@ function getWeappWatchOptions() {
   };
 }
 
+// src/logger.ts
+var import_logger = __toESM(require("@weapp-core/logger"), 1);
+var logger_default = import_logger.default;
+
 // src/plugins/index.ts
 var import_shared3 = require("@weapp-core/shared");
 var import_fast_glob = __toESM(require("fast-glob"), 1);
@@ -82,7 +86,7 @@ function createDebugger(namespace) {
 // src/entry.ts
 var import_node_process = __toESM(require("process"), 1);
 var import_shared2 = require("@weapp-core/shared");
-var import_klaw = __toESM(require("klaw"), 1);
+var import_fdir = require("fdir");
 var import_micromatch = __toESM(require("micromatch"), 1);
 var import_pathe3 = __toESM(require("pathe"), 1);
 
@@ -266,21 +270,15 @@ async function getEntries(options) {
         type: "subPackageEntry"
       });
     }
-    for await (const file of (0, import_klaw.default)(
-      import_pathe3.default.join(root, subPackageRoot),
-      {
-        filter
-      }
-    )) {
-      if (file.stats.isFile()) {
-        if (/\.wxml$/.test(file.path)) {
-          const entry = getWxmlEntry(file.path, formatPath);
-          if (entry) {
-            if (entry.type === "component") {
-              componentEntries.push(entry);
-            } else if (entry.type === "page") {
-              pageEntries.push(entry);
-            }
+    const files = await new import_fdir.fdir().withFullPaths().filter(filter).crawl(import_pathe3.default.join(root, subPackageRoot)).withPromise();
+    for (const file of files) {
+      if (/\.wxml$/.test(file)) {
+        const entry = getWxmlEntry(file, formatPath);
+        if (entry) {
+          if (entry.type === "component") {
+            componentEntries.push(entry);
+          } else if (entry.type === "page") {
+            pageEntries.push(entry);
           }
         }
       }
@@ -310,21 +308,15 @@ async function getEntries(options) {
       );
       const pageEntries = [];
       const componentEntries = [];
-      for await (const file of (0, import_klaw.default)(
-        import_pathe3.default.join(root, srcRoot),
-        {
-          filter
-        }
-      )) {
-        if (file.stats.isFile()) {
-          if (/\.wxml$/.test(file.path)) {
-            const entry = getWxmlEntry(file.path, formatPath);
-            if (entry) {
-              if (entry.type === "component") {
-                componentEntries.push(entry);
-              } else if (entry.type === "page") {
-                pageEntries.push(entry);
-              }
+      const files = await new import_fdir.fdir().withFullPaths().filter(filter).crawl(import_pathe3.default.join(root, srcRoot)).withPromise();
+      for (const file of files) {
+        if (/\.wxml$/.test(file)) {
+          const entry = getWxmlEntry(file, formatPath);
+          if (entry) {
+            if (entry.type === "component") {
+              componentEntries.push(entry);
+            } else if (entry.type === "page") {
+              pageEntries.push(entry);
             }
           }
         }
@@ -334,7 +326,6 @@ async function getEntries(options) {
         pages: pageEntries,
         components: componentEntries,
         subPackages: subPackageDeps
-        // walkPathsSet,
       };
     }
   }
@@ -594,12 +585,6 @@ var CompilerContext = class _CompilerContext {
   get mpDistRoot() {
     return this.projectConfig.miniprogramRoot || this.projectConfig.srcMiniprogramRoot || "";
   }
-  // get weappConfig() {
-  //   return this.inlineConfig.weapp
-  // }
-  // get inlineSubPackageConfig() {
-  //   return this.weappConfig?.subPackage
-  // }
   forkSubPackage(subPackage) {
     const ctx = new _CompilerContext({
       cwd: this.cwd,
@@ -635,7 +620,9 @@ var CompilerContext = class _CompilerContext {
         mode: "development",
         plugins: [vitePluginWeapp(this)],
         build: {
-          watch: {},
+          watch: {
+            exclude: ["node_modules/**", this.mpDistRoot ? import_pathe5.default.join(this.mpDistRoot, "**") : "dist/**"]
+          },
           minify: false,
           emptyOutDir: false
         },
@@ -703,10 +690,24 @@ var CompilerContext = class _CompilerContext {
         }
       }
     );
-    const output = await (0, import_vite2.build)(
-      inlineConfig
-    );
-    return output;
+    if (this.type === "subPackage" && this.subPackage) {
+      const subPackageInlineConfig = Object.assign({}, inlineConfig, {
+        weapp: {
+          srcRoot: this.parent?.srcRoot,
+          type: this.type,
+          subPackage: this.subPackage
+        }
+      });
+      const output = await (0, import_vite2.build)(
+        subPackageInlineConfig
+      );
+      return output;
+    } else if (this.type === "app") {
+      const output = await (0, import_vite2.build)(
+        inlineConfig
+      );
+      return output;
+    }
   }
   build() {
     if (this.isDev) {
@@ -758,11 +759,9 @@ var CompilerContext = class _CompilerContext {
         commonjsOptions: {
           transformMixedEsModules: true,
           include: void 0
-        },
-        watch: {
-          exclude: ["node_modules/**", this.mpDistRoot ? import_pathe5.default.join(this.mpDistRoot, "**") : "dist/**"]
         }
       },
+      logLevel: "info",
       plugins: [
         (0, import_vite_tsconfig_paths.default)()
       ],
@@ -820,11 +819,14 @@ var CompilerContext = class _CompilerContext {
                         strict: false,
                         entryFileNames: "[name].js"
                       }
+                      // logLevel: 'silent',
                     },
                     assetsDir: "."
-                  }
+                  },
+                  logLevel: "error"
                 });
               }
+              logger_default.success(`${dep} \u4F9D\u8D56\u5904\u7406\u5B8C\u6210!`);
             }
           }
         }

package/dist/index.d.cts

@@ -45,8 +45,8 @@ declare class CompilerContext {
     forkSubPackage(subPackage: SubPackage): CompilerContext;
     internalDev(inlineConfig: InlineConfig): Promise<RollupWatcher>;
     runDev(): Promise<FSWatcher | undefined>;
-    runProd(): Promise<RollupOutput | RollupOutput[]>;
-    build(): Promise<FSWatcher | undefined> | Promise<RollupOutput | RollupOutput[]>;
+    runProd(): Promise<RollupOutput | RollupOutput[] | undefined>;
+    build(): Promise<FSWatcher | undefined> | Promise<RollupOutput | RollupOutput[] | undefined>;
     loadDefaultConfig(): Promise<void>;
     buildNpm(): Promise<void>;
 }

package/dist/index.d.ts

@@ -45,8 +45,8 @@ declare class CompilerContext {
     forkSubPackage(subPackage: SubPackage): CompilerContext;
     internalDev(inlineConfig: InlineConfig): Promise<RollupWatcher>;
     runDev(): Promise<FSWatcher | undefined>;
-    runProd(): Promise<RollupOutput | RollupOutput[]>;
-    build(): Promise<FSWatcher | undefined> | Promise<RollupOutput | RollupOutput[]>;
+    runProd(): Promise<RollupOutput | RollupOutput[] | undefined>;
+    build(): Promise<FSWatcher | undefined> | Promise<RollupOutput | RollupOutput[] | undefined>;
     loadDefaultConfig(): Promise<void>;
     buildNpm(): Promise<void>;
 }

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import {
   CompilerContext
-} from "./chunk-3EHL3BIF.mjs";
+} from "./chunk-NP647U5Z.mjs";
 import "./chunk-444MQSSG.mjs";
 export {
   CompilerContext

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-vite",
   "type": "module",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "weapp-vite 一个现代化的小程序打包工具",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -54,18 +54,18 @@
     "chokidar": "^3.6.0",
     "debug": "^4.3.7",
     "fast-glob": "^3.3.2",
+    "fdir": "^6.3.0",
     "fs-extra": "^11.2.0",
     "htmlparser2": "^9.1.0",
-    "klaw": "^4.1.0",
     "magic-string": "^0.30.11",
     "micromatch": "^4.0.8",
     "pathe": "^1.1.2",
     "picocolors": "^1.1.0",
     "pkg-types": "^1.2.0",
     "vite-tsconfig-paths": "^5.0.1",
+    "@weapp-core/init": "^1.0.4",
     "@weapp-core/logger": "^1.0.1",
     "@weapp-core/shared": "^1.0.1",
-    "@weapp-core/init": "^1.0.4",
     "weapp-ide-cli": "^2.0.5"
   },
   "publishConfig": {