weapp-vite 1.7.6 → 1.7.7

package/dist/{chunk-NWYDKKXS.mjs → chunk-K6LFTXPJ.mjs}

@@ -1,6 +1,6 @@
 import {
   init_esm_shims
-} from "./chunk-F57UPGHA.mjs";
+} from "./chunk-UZ7WU232.mjs";
 
 // src/config.ts
 init_esm_shims();

package/dist/{chunk-LPM5NKJS.mjs → chunk-NBYOQ6NU.mjs}

@@ -2,7 +2,7 @@ import {
   __commonJS,
   __toESM,
   init_esm_shims
-} from "./chunk-F57UPGHA.mjs";
+} from "./chunk-UZ7WU232.mjs";
 
 // ../../node_modules/.pnpm/debounce@2.2.0/node_modules/debounce/index.js
 var require_debounce = __commonJS({
@@ -95,7 +95,7 @@ var logger_default = logger;
 init_esm_shims();
 
 // package.json
-var version = "1.7.6";
+var version = "1.7.7";
 
 // src/constants.ts
 var VERSION = version;
@@ -105,10 +105,11 @@ var supportedCssLangs = ["wxss", "scss", "less", "sass", "styl"];
 
 // src/context.ts
 init_esm_shims();
-import { createRequire } from "node:module";
 import process from "node:process";
 import { addExtension as addExtension2, defu as defu2, get as get2, isObject as isObject3, objectHash, removeExtension as removeExtension2 } from "@weapp-core/shared";
+import { deleteAsync } from "del";
 import fs5 from "fs-extra";
+import { getPackageInfo, resolveModule } from "local-pkg";
 import path5 from "pathe";
 import { build, loadConfigFromFile } from "vite";
 import tsconfigPaths from "vite-tsconfig-paths";
@@ -890,7 +891,6 @@ function vitePluginWeapp(ctx, subPackageMeta) {
 
 // src/context.ts
 var debug2 = createDebugger("weapp-vite:context");
-var require2 = createRequire(import.meta.url);
 var once = false;
 function logBuildIndependentSubPackageFinish(root) {
   if (!once) {
@@ -1068,7 +1068,15 @@ var CompilerContext = class {
   }
   async build() {
     if (this.mpDistRoot) {
-      await fs5.emptyDir(this.outDir);
+      const deletedFilePaths = await deleteAsync(
+        [
+          path5.resolve(this.outDir, "**")
+        ],
+        {
+          ignore: ["**/miniprogram_npm/**"]
+        }
+      );
+      debug2?.("deletedFilePaths", deletedFilePaths);
       logger_default.success(`\u5DF2\u6E05\u7A7A ${this.mpDistRoot} \u76EE\u5F55`);
     }
     debug2?.("build start");
@@ -1178,6 +1186,7 @@ var CompilerContext = class {
         }
       ];
     }
+    const heading = subPackage?.root ? `\u5206\u5305[${subPackage.root}]:` : "";
     for (const relation of packNpmRelationList) {
       const packageJsonPath = path5.resolve(this.cwd, relation.packageJsonPath);
       if (await fs5.exists(packageJsonPath)) {
@@ -1192,31 +1201,37 @@ var CompilerContext = class {
                   continue;
                 }
               }
-              const id = `${dep}/package.json`;
-              const targetJson = require2(id);
+              const packageInfo = await getPackageInfo(dep);
+              if (!packageInfo) {
+                continue;
+              }
+              const { packageJson: targetJson, rootPath } = packageInfo;
               if (Reflect.has(targetJson, "miniprogram") && targetJson.miniprogram) {
-                const targetJsonPath = require2.resolve(id);
-                const dest = path5.join(outDir, dep);
-                if (!isDependenciesCacheOutdate && await fs5.exists(dest)) {
-                  debug2?.(`${dep} \u4F9D\u8D56\u672A\u53D1\u751F\u53D8\u5316\uFF0C\u8DF3\u8FC7\u5904\u7406!`);
+                const destOutDir = path5.join(outDir, dep);
+                if (!isDependenciesCacheOutdate && await fs5.exists(destOutDir)) {
+                  logger_default.info(`${heading} ${dep} \u4F9D\u8D56\u672A\u53D1\u751F\u53D8\u5316\uFF0C\u8DF3\u8FC7\u5904\u7406!`);
                   continue;
                 }
                 await fs5.copy(
                   path5.resolve(
-                    path5.dirname(targetJsonPath),
+                    rootPath,
                     targetJson.miniprogram
                   ),
-                  dest
+                  destOutDir
                 );
               } else {
                 const destOutDir = path5.join(outDir, dep);
                 if (!isDependenciesCacheOutdate && await fs5.exists(destOutDir)) {
-                  debug2?.(`${dep} \u4F9D\u8D56\u672A\u53D1\u751F\u53D8\u5316\uFF0C\u8DF3\u8FC7\u5904\u7406!`);
+                  logger_default.info(`${heading} ${dep} \u4F9D\u8D56\u672A\u53D1\u751F\u53D8\u5316\uFF0C\u8DF3\u8FC7\u5904\u7406!`);
+                  continue;
+                }
+                const index = resolveModule(dep);
+                if (!index) {
                   continue;
                 }
                 const mergedOptions = defu2(options, {
                   entry: {
-                    index: require2.resolve(dep)
+                    index
                   },
                   format: ["cjs"],
                   outDir: destOutDir,
@@ -1241,7 +1256,7 @@ var CompilerContext = class {
                 }
                 finalOptions && await tsupBuild(finalOptions);
               }
-              logger_default.success(`${dep} \u4F9D\u8D56\u5904\u7406\u5B8C\u6210!`);
+              logger_default.success(`${heading} ${dep} \u4F9D\u8D56\u5904\u7406\u5B8C\u6210!`);
             }
           }
         }

package/dist/{chunk-F57UPGHA.mjs → chunk-UZ7WU232.mjs}

@@ -27,9 +27,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../../node_modules/.pnpm/tsup@8.3.5_@swc+core@1.9.2_jiti@2.4.0_postcss@8.4.49_tsx@4.19.2_typescript@5.6.3_yaml@2.6.0/node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@8.3.5_@swc+core@1.9.2_jiti@2.4.0_postcss@8.4.49_tsx@4.19.2_typescript@5.6.3_yaml@2.6.1/node_modules/tsup/assets/esm_shims.js
 var init_esm_shims = __esm({
-  "../../node_modules/.pnpm/tsup@8.3.5_@swc+core@1.9.2_jiti@2.4.0_postcss@8.4.49_tsx@4.19.2_typescript@5.6.3_yaml@2.6.0/node_modules/tsup/assets/esm_shims.js"() {
+  "../../node_modules/.pnpm/tsup@8.3.5_@swc+core@1.9.2_jiti@2.4.0_postcss@8.4.49_tsx@4.19.2_typescript@5.6.3_yaml@2.6.1/node_modules/tsup/assets/esm_shims.js"() {
     "use strict";
   }
 });

package/dist/cli.cjs

@@ -28,13 +28,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../../node_modules/.pnpm/tsup@8.3.5_@swc+core@1.9.2_jiti@2.4.0_postcss@8.4.49_tsx@4.19.2_typescript@5.6.3_yaml@2.6.0/node_modules/tsup/assets/cjs_shims.js
-var getImportMetaUrl, importMetaUrl;
+// ../../node_modules/.pnpm/tsup@8.3.5_@swc+core@1.9.2_jiti@2.4.0_postcss@8.4.49_tsx@4.19.2_typescript@5.6.3_yaml@2.6.1/node_modules/tsup/assets/cjs_shims.js
 var init_cjs_shims = __esm({
-  "../../node_modules/.pnpm/tsup@8.3.5_@swc+core@1.9.2_jiti@2.4.0_postcss@8.4.49_tsx@4.19.2_typescript@5.6.3_yaml@2.6.0/node_modules/tsup/assets/cjs_shims.js"() {
+  "../../node_modules/.pnpm/tsup@8.3.5_@swc+core@1.9.2_jiti@2.4.0_postcss@8.4.49_tsx@4.19.2_typescript@5.6.3_yaml@2.6.1/node_modules/tsup/assets/cjs_shims.js"() {
     "use strict";
-    getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
-    importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
   }
 });
 
@@ -132,7 +129,7 @@ var import_weapp_ide_cli = require("weapp-ide-cli");
 init_cjs_shims();
 
 // package.json
-var version = "1.7.6";
+var version = "1.7.7";
 
 // src/constants.ts
 var VERSION = version;
@@ -142,10 +139,11 @@ var supportedCssLangs = ["wxss", "scss", "less", "sass", "styl"];
 
 // src/context.ts
 init_cjs_shims();
-var import_node_module = require("module");
 var import_node_process = __toESM(require("process"), 1);
 var import_shared5 = require("@weapp-core/shared");
+var import_del = require("del");
 var import_fs_extra5 = __toESM(require("fs-extra"), 1);
+var import_local_pkg = require("local-pkg");
 var import_pathe5 = __toESM(require("pathe"), 1);
 var import_vite2 = require("vite");
 var import_vite_tsconfig_paths = __toESM(require("vite-tsconfig-paths"), 1);
@@ -935,7 +933,6 @@ init_cjs_shims();
 
 // src/context.ts
 var debug2 = createDebugger("weapp-vite:context");
-var require2 = (0, import_node_module.createRequire)(importMetaUrl);
 var once = false;
 function logBuildIndependentSubPackageFinish(root) {
   if (!once) {
@@ -1113,7 +1110,15 @@ var CompilerContext = class {
   }
   async build() {
     if (this.mpDistRoot) {
-      await import_fs_extra5.default.emptyDir(this.outDir);
+      const deletedFilePaths = await (0, import_del.deleteAsync)(
+        [
+          import_pathe5.default.resolve(this.outDir, "**")
+        ],
+        {
+          ignore: ["**/miniprogram_npm/**"]
+        }
+      );
+      debug2?.("deletedFilePaths", deletedFilePaths);
       logger_default.success(`\u5DF2\u6E05\u7A7A ${this.mpDistRoot} \u76EE\u5F55`);
     }
     debug2?.("build start");
@@ -1223,6 +1228,7 @@ var CompilerContext = class {
         }
       ];
     }
+    const heading = subPackage?.root ? `\u5206\u5305[${subPackage.root}]:` : "";
     for (const relation of packNpmRelationList) {
       const packageJsonPath = import_pathe5.default.resolve(this.cwd, relation.packageJsonPath);
       if (await import_fs_extra5.default.exists(packageJsonPath)) {
@@ -1237,31 +1243,37 @@ var CompilerContext = class {
                   continue;
                 }
               }
-              const id = `${dep}/package.json`;
-              const targetJson = require2(id);
+              const packageInfo = await (0, import_local_pkg.getPackageInfo)(dep);
+              if (!packageInfo) {
+                continue;
+              }
+              const { packageJson: targetJson, rootPath } = packageInfo;
               if (Reflect.has(targetJson, "miniprogram") && targetJson.miniprogram) {
-                const targetJsonPath = require2.resolve(id);
-                const dest = import_pathe5.default.join(outDir, dep);
-                if (!isDependenciesCacheOutdate && await import_fs_extra5.default.exists(dest)) {
-                  debug2?.(`${dep} \u4F9D\u8D56\u672A\u53D1\u751F\u53D8\u5316\uFF0C\u8DF3\u8FC7\u5904\u7406!`);
+                const destOutDir = import_pathe5.default.join(outDir, dep);
+                if (!isDependenciesCacheOutdate && await import_fs_extra5.default.exists(destOutDir)) {
+                  logger_default.info(`${heading} ${dep} \u4F9D\u8D56\u672A\u53D1\u751F\u53D8\u5316\uFF0C\u8DF3\u8FC7\u5904\u7406!`);
                   continue;
                 }
                 await import_fs_extra5.default.copy(
                   import_pathe5.default.resolve(
-                    import_pathe5.default.dirname(targetJsonPath),
+                    rootPath,
                     targetJson.miniprogram
                   ),
-                  dest
+                  destOutDir
                 );
               } else {
                 const destOutDir = import_pathe5.default.join(outDir, dep);
                 if (!isDependenciesCacheOutdate && await import_fs_extra5.default.exists(destOutDir)) {
-                  debug2?.(`${dep} \u4F9D\u8D56\u672A\u53D1\u751F\u53D8\u5316\uFF0C\u8DF3\u8FC7\u5904\u7406!`);
+                  logger_default.info(`${heading} ${dep} \u4F9D\u8D56\u672A\u53D1\u751F\u53D8\u5316\uFF0C\u8DF3\u8FC7\u5904\u7406!`);
+                  continue;
+                }
+                const index = (0, import_local_pkg.resolveModule)(dep);
+                if (!index) {
                   continue;
                 }
                 const mergedOptions = (0, import_shared5.defu)(options, {
                   entry: {
-                    index: require2.resolve(dep)
+                    index
                   },
                   format: ["cjs"],
                   outDir: destOutDir,
@@ -1286,7 +1298,7 @@ var CompilerContext = class {
                 }
                 finalOptions && await tsupBuild(finalOptions);
               }
-              logger_default.success(`${dep} \u4F9D\u8D56\u5904\u7406\u5B8C\u6210!`);
+              logger_default.success(`${heading} ${dep} \u4F9D\u8D56\u5904\u7406\u5B8C\u6210!`);
             }
           }
         }

package/dist/cli.mjs

@@ -2,11 +2,11 @@ import {
   VERSION,
   createCompilerContext,
   logger_default
-} from "./chunk-LPM5NKJS.mjs";
-import "./chunk-NWYDKKXS.mjs";
+} from "./chunk-NBYOQ6NU.mjs";
+import "./chunk-K6LFTXPJ.mjs";
 import {
   init_esm_shims
-} from "./chunk-F57UPGHA.mjs";
+} from "./chunk-UZ7WU232.mjs";
 
 // src/cli.ts
 init_esm_shims();

package/dist/config.mjs

@@ -1,7 +1,7 @@
 import {
   defineConfig
-} from "./chunk-NWYDKKXS.mjs";
-import "./chunk-F57UPGHA.mjs";
+} from "./chunk-K6LFTXPJ.mjs";
+import "./chunk-UZ7WU232.mjs";
 export {
   defineConfig
 };

package/dist/index.cjs

@@ -33,13 +33,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// ../../node_modules/.pnpm/tsup@8.3.5_@swc+core@1.9.2_jiti@2.4.0_postcss@8.4.49_tsx@4.19.2_typescript@5.6.3_yaml@2.6.0/node_modules/tsup/assets/cjs_shims.js
-var getImportMetaUrl, importMetaUrl;
+// ../../node_modules/.pnpm/tsup@8.3.5_@swc+core@1.9.2_jiti@2.4.0_postcss@8.4.49_tsx@4.19.2_typescript@5.6.3_yaml@2.6.1/node_modules/tsup/assets/cjs_shims.js
 var init_cjs_shims = __esm({
-  "../../node_modules/.pnpm/tsup@8.3.5_@swc+core@1.9.2_jiti@2.4.0_postcss@8.4.49_tsx@4.19.2_typescript@5.6.3_yaml@2.6.0/node_modules/tsup/assets/cjs_shims.js"() {
+  "../../node_modules/.pnpm/tsup@8.3.5_@swc+core@1.9.2_jiti@2.4.0_postcss@8.4.49_tsx@4.19.2_typescript@5.6.3_yaml@2.6.1/node_modules/tsup/assets/cjs_shims.js"() {
     "use strict";
-    getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
-    importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
   }
 });
 
@@ -136,10 +133,11 @@ init_cjs_shims();
 
 // src/context.ts
 init_cjs_shims();
-var import_node_module = require("module");
 var import_node_process = __toESM(require("process"), 1);
 var import_shared5 = require("@weapp-core/shared");
+var import_del = require("del");
 var import_fs_extra5 = __toESM(require("fs-extra"), 1);
+var import_local_pkg = require("local-pkg");
 var import_pathe5 = __toESM(require("pathe"), 1);
 var import_vite2 = require("vite");
 var import_vite_tsconfig_paths = __toESM(require("vite-tsconfig-paths"), 1);
@@ -935,7 +933,6 @@ init_cjs_shims();
 
 // src/context.ts
 var debug2 = createDebugger("weapp-vite:context");
-var require2 = (0, import_node_module.createRequire)(importMetaUrl);
 var once = false;
 function logBuildIndependentSubPackageFinish(root) {
   if (!once) {
@@ -1113,7 +1110,15 @@ var CompilerContext = class {
   }
   async build() {
     if (this.mpDistRoot) {
-      await import_fs_extra5.default.emptyDir(this.outDir);
+      const deletedFilePaths = await (0, import_del.deleteAsync)(
+        [
+          import_pathe5.default.resolve(this.outDir, "**")
+        ],
+        {
+          ignore: ["**/miniprogram_npm/**"]
+        }
+      );
+      debug2?.("deletedFilePaths", deletedFilePaths);
       logger_default.success(`\u5DF2\u6E05\u7A7A ${this.mpDistRoot} \u76EE\u5F55`);
     }
     debug2?.("build start");
@@ -1223,6 +1228,7 @@ var CompilerContext = class {
         }
       ];
     }
+    const heading = subPackage?.root ? `\u5206\u5305[${subPackage.root}]:` : "";
     for (const relation of packNpmRelationList) {
       const packageJsonPath = import_pathe5.default.resolve(this.cwd, relation.packageJsonPath);
       if (await import_fs_extra5.default.exists(packageJsonPath)) {
@@ -1237,31 +1243,37 @@ var CompilerContext = class {
                   continue;
                 }
               }
-              const id = `${dep}/package.json`;
-              const targetJson = require2(id);
+              const packageInfo = await (0, import_local_pkg.getPackageInfo)(dep);
+              if (!packageInfo) {
+                continue;
+              }
+              const { packageJson: targetJson, rootPath } = packageInfo;
               if (Reflect.has(targetJson, "miniprogram") && targetJson.miniprogram) {
-                const targetJsonPath = require2.resolve(id);
-                const dest = import_pathe5.default.join(outDir, dep);
-                if (!isDependenciesCacheOutdate && await import_fs_extra5.default.exists(dest)) {
-                  debug2?.(`${dep} \u4F9D\u8D56\u672A\u53D1\u751F\u53D8\u5316\uFF0C\u8DF3\u8FC7\u5904\u7406!`);
+                const destOutDir = import_pathe5.default.join(outDir, dep);
+                if (!isDependenciesCacheOutdate && await import_fs_extra5.default.exists(destOutDir)) {
+                  logger_default.info(`${heading} ${dep} \u4F9D\u8D56\u672A\u53D1\u751F\u53D8\u5316\uFF0C\u8DF3\u8FC7\u5904\u7406!`);
                   continue;
                 }
                 await import_fs_extra5.default.copy(
                   import_pathe5.default.resolve(
-                    import_pathe5.default.dirname(targetJsonPath),
+                    rootPath,
                     targetJson.miniprogram
                   ),
-                  dest
+                  destOutDir
                 );
               } else {
                 const destOutDir = import_pathe5.default.join(outDir, dep);
                 if (!isDependenciesCacheOutdate && await import_fs_extra5.default.exists(destOutDir)) {
-                  debug2?.(`${dep} \u4F9D\u8D56\u672A\u53D1\u751F\u53D8\u5316\uFF0C\u8DF3\u8FC7\u5904\u7406!`);
+                  logger_default.info(`${heading} ${dep} \u4F9D\u8D56\u672A\u53D1\u751F\u53D8\u5316\uFF0C\u8DF3\u8FC7\u5904\u7406!`);
+                  continue;
+                }
+                const index = (0, import_local_pkg.resolveModule)(dep);
+                if (!index) {
                   continue;
                 }
                 const mergedOptions = (0, import_shared5.defu)(options, {
                   entry: {
-                    index: require2.resolve(dep)
+                    index
                   },
                   format: ["cjs"],
                   outDir: destOutDir,
@@ -1286,7 +1298,7 @@ var CompilerContext = class {
                 }
                 finalOptions && await tsupBuild(finalOptions);
               }
-              logger_default.success(`${dep} \u4F9D\u8D56\u5904\u7406\u5B8C\u6210!`);
+              logger_default.success(`${heading} ${dep} \u4F9D\u8D56\u5904\u7406\u5B8C\u6210!`);
             }
           }
         }

package/dist/index.mjs

@@ -1,11 +1,11 @@
 import {
   CompilerContext,
   createCompilerContext
-} from "./chunk-LPM5NKJS.mjs";
-import "./chunk-NWYDKKXS.mjs";
+} from "./chunk-NBYOQ6NU.mjs";
+import "./chunk-K6LFTXPJ.mjs";
 import {
   init_esm_shims
-} from "./chunk-F57UPGHA.mjs";
+} from "./chunk-UZ7WU232.mjs";
 
 // src/index.ts
 init_esm_shims();

package/dist/json.mjs

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-vite",
   "type": "module",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "description": "weapp-vite 一个现代化的小程序打包工具",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -68,21 +68,23 @@
     "cac": "^6.7.14",
     "comment-json": "^4.2.5",
     "debug": "^4.3.7",
+    "del": "^8.0.0",
     "esbuild": "^0.24.0",
     "fdir": "^6.4.2",
     "fs-extra": "^11.2.0",
     "htmlparser2": "^9.1.0",
-    "magic-string": "^0.30.12",
+    "local-pkg": "^0.5.1",
+    "magic-string": "^0.30.13",
     "pathe": "^1.1.2",
     "picomatch": "^4.0.2",
     "tsup": "^8.3.5",
     "vite": "^5.4.11",
-    "vite-tsconfig-paths": "^5.1.2",
+    "vite-tsconfig-paths": "^5.1.3",
     "@weapp-core/init": "^1.1.10",
     "@weapp-core/logger": "^1.0.1",
     "@weapp-core/schematics": "^1.0.5",
-    "weapp-ide-cli": "^2.0.6",
-    "@weapp-core/shared": "^1.0.4"
+    "@weapp-core/shared": "^1.0.4",
+    "weapp-ide-cli": "^2.0.6"
   },
   "publishConfig": {
     "access": "public",