weapp-vite 1.6.7 → 1.6.8

package/dist/{chunk-5PUUYFZM.mjs → chunk-C7FRWINE.mjs}

@@ -3,7 +3,7 @@ import logger from "@weapp-core/logger";
 var logger_default = logger;
 
 // package.json
-var version = "1.6.7";
+var version = "1.6.8";
 
 // src/constants.ts
 var VERSION = version;
@@ -533,6 +533,9 @@ var CompilerContext = class {
   aliasEntries;
   platform;
   outputExtensions;
+  /**
+   * 不修改 ctx
+   */
   readCommentJson;
   /**
    * esbuild 定义的环境变量
@@ -777,7 +780,7 @@ var CompilerContext = class {
   // miniprogram_dist
   // miniprogram
   // https://developers.weixin.qq.com/miniprogram/dev/devtools/npm.html#%E8%87%AA%E5%AE%9A%E4%B9%89%E7%BB%84%E4%BB%B6%E7%9B%B8%E5%85%B3%E7%A4%BA%E4%BE%8B
-  async buildNpm(options) {
+  async buildNpm(subPackage, options) {
     debug2?.("buildNpm start");
     const { build: tsupBuild } = await import("tsup");
     const isDependenciesCacheOutdate = await this.checkDependenciesCacheOutdate();
@@ -796,7 +799,7 @@ var CompilerContext = class {
       const packageJsonPath = path5.resolve(this.cwd, relation.packageJsonPath);
       if (await fs5.exists(packageJsonPath)) {
         const pkgJson = await fs5.readJson(packageJsonPath);
-        const outDir = path5.resolve(this.cwd, relation.miniprogramNpmDistDir, "miniprogram_npm");
+        const outDir = path5.resolve(this.cwd, relation.miniprogramNpmDistDir, subPackage?.root ?? "", "miniprogram_npm");
         if (pkgJson.dependencies) {
           const dependencies = Object.keys(pkgJson.dependencies);
           if (dependencies.length > 0) {
@@ -858,7 +861,12 @@ var CompilerContext = class {
     await this.writeDependenciesCache();
     debug2?.("buildNpm end");
   }
-  async usingComponentsHandler(entry, relDir) {
+  /**
+   * @deps [this.scanComponentEntry]
+   * @param entry
+   * @param relDir
+   */
+  async usingComponentsHandler(entry, relDir, subPackageMeta) {
     const { usingComponents } = entry.json;
     if (usingComponents) {
       for (const [, componentUrl] of Object.entries(usingComponents)) {
@@ -869,10 +877,10 @@ var CompilerContext = class {
         if (tokens[0] && isObject3(this.packageJson.dependencies) && Reflect.has(this.packageJson.dependencies, tokens[0])) {
           continue;
         } else if (tokens[0] === "") {
-          await this.scanComponentEntry(componentUrl.substring(1), path5.resolve(this.cwd, this.srcRoot));
+          await this.scanComponentEntry(componentUrl.substring(1), path5.resolve(this.cwd, this.srcRoot), subPackageMeta);
         } else {
           const importee = resolveImportee(componentUrl, entry, this.aliasEntries);
-          await this.scanComponentEntry(importee, relDir);
+          await this.scanComponentEntry(importee, relDir, subPackageMeta);
         }
       }
     }
@@ -882,6 +890,17 @@ var CompilerContext = class {
     this.entries.length = 0;
     this.subPackageMeta = {};
   }
+  // fork() {
+  //   return new CompilerContext({
+  //     cwd: this.cwd,
+  //     inlineConfig: this.inlineConfig,
+  //     isDev: this.isDev,
+  //     mode: this.mode,
+  //     packageJson: this.packageJson,
+  //     platform: this.platform,
+  //     projectConfig: this.projectConfig,
+  //   })
+  // }
   async scanAppEntry() {
     debug2?.("scanAppEntry start");
     this.resetEntries();
@@ -933,14 +952,13 @@ var CompilerContext = class {
               entriesSet: /* @__PURE__ */ new Set(),
               subPackage: sub
             };
-            const scanComponentEntry = this.scanComponentEntry.bind(meta);
             if (Array.isArray(sub.pages)) {
               for (const page of sub.pages) {
-                await scanComponentEntry(path5.join(sub.root, page), appDirname);
+                await this.scanComponentEntry(path5.join(sub.root, page), appDirname, meta);
               }
             }
             if (sub.entry) {
-              await scanComponentEntry(path5.join(sub.root, sub.entry), appDirname);
+              await this.scanComponentEntry(path5.join(sub.root, sub.entry), appDirname, meta);
             }
             this.subPackageMeta[sub.root] = meta;
           } else {
@@ -969,16 +987,20 @@ var CompilerContext = class {
   // pages
   // https://developers.weixin.qq.com/miniprogram/dev/framework/structure.html
   // 页面可以没有 JSON
-  async scanComponentEntry(componentEntry, dirname) {
+  async scanComponentEntry(componentEntry, dirname, subPackageMeta) {
+    const meta = subPackageMeta ?? {
+      entriesSet: this.entriesSet,
+      entries: this.entries
+    };
     debug2?.("scanComponentEntry start", componentEntry);
     const baseName = removeExtension(path5.resolve(dirname, componentEntry));
     const jsEntry = await findJsEntry(baseName);
     const partialEntry = {
       path: jsEntry
     };
-    if (jsEntry && !this.entriesSet.has(jsEntry)) {
-      this.entriesSet.add(jsEntry);
-      this.entries.push(partialEntry);
+    if (jsEntry && !meta.entriesSet.has(jsEntry)) {
+      meta.entriesSet.add(jsEntry);
+      meta.entries.push(partialEntry);
     }
     const configFile = await findJsonEntry(baseName);
     if (configFile) {
@@ -992,7 +1014,7 @@ var CompilerContext = class {
         partialEntry.jsonPath = jsonFragment.jsonPath;
       }
       if (isObject3(config)) {
-        await this.usingComponentsHandler(jsonFragment, path5.dirname(configFile));
+        await this.usingComponentsHandler(jsonFragment, path5.dirname(configFile), subPackageMeta);
       }
     }
     debug2?.("scanComponentEntry end", componentEntry);
@@ -1017,6 +1039,7 @@ var CompilerContext = class {
           }
         }
       });
+      await this.buildNpm(meta.subPackage);
       const output = await build(
         inlineConfig
       );

package/dist/cli.cjs

@@ -22,7 +22,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../../node_modules/.pnpm/tsup@8.3.5_@swc+core@1.7.40_jiti@2.3.1_postcss@8.4.47_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.7.42_jiti@2.3.1_postcss@8.4.47_tsx@4.19.2_typescript@5.6.3_yaml@2.6.0/node_modules/tsup/assets/cjs_shims.js
 var getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
 var importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
 
@@ -34,7 +34,7 @@ var import_vite3 = require("vite");
 var import_weapp_ide_cli = require("weapp-ide-cli");
 
 // package.json
-var version = "1.6.7";
+var version = "1.6.8";
 
 // src/constants.ts
 var VERSION = version;
@@ -568,6 +568,9 @@ var CompilerContext = class {
   aliasEntries;
   platform;
   outputExtensions;
+  /**
+   * 不修改 ctx
+   */
   readCommentJson;
   /**
    * esbuild 定义的环境变量
@@ -812,7 +815,7 @@ var CompilerContext = class {
   // miniprogram_dist
   // miniprogram
   // https://developers.weixin.qq.com/miniprogram/dev/devtools/npm.html#%E8%87%AA%E5%AE%9A%E4%B9%89%E7%BB%84%E4%BB%B6%E7%9B%B8%E5%85%B3%E7%A4%BA%E4%BE%8B
-  async buildNpm(options) {
+  async buildNpm(subPackage, options) {
     debug2?.("buildNpm start");
     const { build: tsupBuild } = await import("tsup");
     const isDependenciesCacheOutdate = await this.checkDependenciesCacheOutdate();
@@ -831,7 +834,7 @@ var CompilerContext = class {
       const packageJsonPath = import_pathe5.default.resolve(this.cwd, relation.packageJsonPath);
       if (await import_fs_extra5.default.exists(packageJsonPath)) {
         const pkgJson = await import_fs_extra5.default.readJson(packageJsonPath);
-        const outDir = import_pathe5.default.resolve(this.cwd, relation.miniprogramNpmDistDir, "miniprogram_npm");
+        const outDir = import_pathe5.default.resolve(this.cwd, relation.miniprogramNpmDistDir, subPackage?.root ?? "", "miniprogram_npm");
         if (pkgJson.dependencies) {
           const dependencies = Object.keys(pkgJson.dependencies);
           if (dependencies.length > 0) {
@@ -893,7 +896,12 @@ var CompilerContext = class {
     await this.writeDependenciesCache();
     debug2?.("buildNpm end");
   }
-  async usingComponentsHandler(entry, relDir) {
+  /**
+   * @deps [this.scanComponentEntry]
+   * @param entry
+   * @param relDir
+   */
+  async usingComponentsHandler(entry, relDir, subPackageMeta) {
     const { usingComponents } = entry.json;
     if (usingComponents) {
       for (const [, componentUrl] of Object.entries(usingComponents)) {
@@ -904,10 +912,10 @@ var CompilerContext = class {
         if (tokens[0] && (0, import_shared3.isObject)(this.packageJson.dependencies) && Reflect.has(this.packageJson.dependencies, tokens[0])) {
           continue;
         } else if (tokens[0] === "") {
-          await this.scanComponentEntry(componentUrl.substring(1), import_pathe5.default.resolve(this.cwd, this.srcRoot));
+          await this.scanComponentEntry(componentUrl.substring(1), import_pathe5.default.resolve(this.cwd, this.srcRoot), subPackageMeta);
         } else {
           const importee = resolveImportee(componentUrl, entry, this.aliasEntries);
-          await this.scanComponentEntry(importee, relDir);
+          await this.scanComponentEntry(importee, relDir, subPackageMeta);
         }
       }
     }
@@ -917,6 +925,17 @@ var CompilerContext = class {
     this.entries.length = 0;
     this.subPackageMeta = {};
   }
+  // fork() {
+  //   return new CompilerContext({
+  //     cwd: this.cwd,
+  //     inlineConfig: this.inlineConfig,
+  //     isDev: this.isDev,
+  //     mode: this.mode,
+  //     packageJson: this.packageJson,
+  //     platform: this.platform,
+  //     projectConfig: this.projectConfig,
+  //   })
+  // }
   async scanAppEntry() {
     debug2?.("scanAppEntry start");
     this.resetEntries();
@@ -968,14 +987,13 @@ var CompilerContext = class {
               entriesSet: /* @__PURE__ */ new Set(),
               subPackage: sub
             };
-            const scanComponentEntry = this.scanComponentEntry.bind(meta);
             if (Array.isArray(sub.pages)) {
               for (const page of sub.pages) {
-                await scanComponentEntry(import_pathe5.default.join(sub.root, page), appDirname);
+                await this.scanComponentEntry(import_pathe5.default.join(sub.root, page), appDirname, meta);
               }
             }
             if (sub.entry) {
-              await scanComponentEntry(import_pathe5.default.join(sub.root, sub.entry), appDirname);
+              await this.scanComponentEntry(import_pathe5.default.join(sub.root, sub.entry), appDirname, meta);
             }
             this.subPackageMeta[sub.root] = meta;
           } else {
@@ -1004,16 +1022,20 @@ var CompilerContext = class {
   // pages
   // https://developers.weixin.qq.com/miniprogram/dev/framework/structure.html
   // 页面可以没有 JSON
-  async scanComponentEntry(componentEntry, dirname) {
+  async scanComponentEntry(componentEntry, dirname, subPackageMeta) {
+    const meta = subPackageMeta ?? {
+      entriesSet: this.entriesSet,
+      entries: this.entries
+    };
     debug2?.("scanComponentEntry start", componentEntry);
     const baseName = (0, import_shared3.removeExtension)(import_pathe5.default.resolve(dirname, componentEntry));
     const jsEntry = await findJsEntry(baseName);
     const partialEntry = {
       path: jsEntry
     };
-    if (jsEntry && !this.entriesSet.has(jsEntry)) {
-      this.entriesSet.add(jsEntry);
-      this.entries.push(partialEntry);
+    if (jsEntry && !meta.entriesSet.has(jsEntry)) {
+      meta.entriesSet.add(jsEntry);
+      meta.entries.push(partialEntry);
     }
     const configFile = await findJsonEntry(baseName);
     if (configFile) {
@@ -1027,7 +1049,7 @@ var CompilerContext = class {
         partialEntry.jsonPath = jsonFragment.jsonPath;
       }
       if ((0, import_shared3.isObject)(config)) {
-        await this.usingComponentsHandler(jsonFragment, import_pathe5.default.dirname(configFile));
+        await this.usingComponentsHandler(jsonFragment, import_pathe5.default.dirname(configFile), subPackageMeta);
       }
     }
     debug2?.("scanComponentEntry end", componentEntry);
@@ -1052,6 +1074,7 @@ var CompilerContext = class {
           }
         }
       });
+      await this.buildNpm(meta.subPackage);
       const output = await (0, import_vite2.build)(
         inlineConfig
       );
@@ -1165,10 +1188,17 @@ function convertBase(v) {
   }
   return v;
 }
+async function openIde() {
+  try {
+    await (0, import_weapp_ide_cli.parse)(["open", "-p"]);
+  } catch (error) {
+    logger_default.error(error);
+  }
+}
 cli.option("-c, --config <file>", `[string] use specified config file`).option("--base <path>", `[string] public base path (default: /)`, {
   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`).action(async (root, options) => {
+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({
     cwd: root,
@@ -1176,9 +1206,12 @@ cli.command("[root]", "start dev server").alias("serve").alias("dev").option("--
     isDev: true
   });
   if (!options.skipNpm) {
-    await ctx.buildNpm({ sourcemap: true });
+    await ctx.buildNpm(void 0, { sourcemap: true });
   }
   await ctx.build();
+  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]",
@@ -1189,7 +1222,7 @@ cli.command("build [root]", "build for production").option("--target <target>",
 ).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`).action(async (root, options) => {
+).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({
     cwd: root,
@@ -1199,6 +1232,9 @@ cli.command("build [root]", "build for production").option("--target <target>",
   if (!options.skipNpm) {
     await ctx.buildNpm();
   }
+  if (options.open) {
+    await openIde();
+  }
 });
 cli.command("init").action(async () => {
   try {
@@ -1210,11 +1246,7 @@ cli.command("init").action(async () => {
   }
 });
 cli.command("open").action(async () => {
-  try {
-    await (0, import_weapp_ide_cli.parse)(["open", "-p"]);
-  } catch (error) {
-    logger_default.error(error);
-  }
+  await openIde();
 });
 cli.command("npm").alias("build:npm").alias("build-npm").action(async () => {
   try {

package/dist/cli.mjs

@@ -2,7 +2,7 @@ import {
   VERSION,
   createCompilerContext,
   logger_default
-} from "./chunk-5PUUYFZM.mjs";
+} from "./chunk-C7FRWINE.mjs";
 import "./chunk-444MQSSG.mjs";
 
 // src/cli.ts
@@ -96,10 +96,17 @@ function convertBase(v) {
   }
   return v;
 }
+async function openIde() {
+  try {
+    await parse(["open", "-p"]);
+  } catch (error) {
+    logger_default.error(error);
+  }
+}
 cli.option("-c, --config <file>", `[string] use specified config file`).option("--base <path>", `[string] public base path (default: /)`, {
   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`).action(async (root, options) => {
+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({
     cwd: root,
@@ -107,9 +114,12 @@ cli.command("[root]", "start dev server").alias("serve").alias("dev").option("--
     isDev: true
   });
   if (!options.skipNpm) {
-    await ctx.buildNpm({ sourcemap: true });
+    await ctx.buildNpm(void 0, { sourcemap: true });
   }
   await ctx.build();
+  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]",
@@ -120,7 +130,7 @@ cli.command("build [root]", "build for production").option("--target <target>",
 ).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`).action(async (root, options) => {
+).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({
     cwd: root,
@@ -130,6 +140,9 @@ cli.command("build [root]", "build for production").option("--target <target>",
   if (!options.skipNpm) {
     await ctx.buildNpm();
   }
+  if (options.open) {
+    await openIde();
+  }
 });
 cli.command("init").action(async () => {
   try {
@@ -141,11 +154,7 @@ cli.command("init").action(async () => {
   }
 });
 cli.command("open").action(async () => {
-  try {
-    await parse(["open", "-p"]);
-  } catch (error) {
-    logger_default.error(error);
-  }
+  await openIde();
 });
 cli.command("npm").alias("build:npm").alias("build-npm").action(async () => {
   try {

package/dist/{config-BeFRKLxC.d.cts → config-DMYZNPWv.d.cts}

@@ -131,4 +131,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, defineConfig as d };
+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 SubPackage as a, defineConfig as d };

package/dist/{config-BeFRKLxC.d.ts → config-DMYZNPWv.d.ts}

@@ -131,4 +131,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, defineConfig as d };
+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 SubPackage as a, defineConfig as d };

package/dist/config.d.cts

@@ -1,5 +1,5 @@
 export { UserConfig, UserConfigExport, UserConfigFnObject } from 'vite';
-export { d as defineConfig } from './config-BeFRKLxC.cjs';
+export { d as defineConfig } from './config-DMYZNPWv.cjs';
 import '@weapp-core/schematics';
 import 'pkg-types';
 import 'tsup';

package/dist/config.d.ts

@@ -1,5 +1,5 @@
 export { UserConfig, UserConfigExport, UserConfigFnObject } from 'vite';
-export { d as defineConfig } from './config-BeFRKLxC.js';
+export { d as defineConfig } from './config-DMYZNPWv.js';
 import '@weapp-core/schematics';
 import 'pkg-types';
 import 'tsup';

package/dist/index.cjs

@@ -35,7 +35,7 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 
-// ../../node_modules/.pnpm/tsup@8.3.5_@swc+core@1.7.40_jiti@2.3.1_postcss@8.4.47_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.7.42_jiti@2.3.1_postcss@8.4.47_tsx@4.19.2_typescript@5.6.3_yaml@2.6.0/node_modules/tsup/assets/cjs_shims.js
 var getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
 var importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
 
@@ -570,6 +570,9 @@ var CompilerContext = class {
   aliasEntries;
   platform;
   outputExtensions;
+  /**
+   * 不修改 ctx
+   */
   readCommentJson;
   /**
    * esbuild 定义的环境变量
@@ -814,7 +817,7 @@ var CompilerContext = class {
   // miniprogram_dist
   // miniprogram
   // https://developers.weixin.qq.com/miniprogram/dev/devtools/npm.html#%E8%87%AA%E5%AE%9A%E4%B9%89%E7%BB%84%E4%BB%B6%E7%9B%B8%E5%85%B3%E7%A4%BA%E4%BE%8B
-  async buildNpm(options) {
+  async buildNpm(subPackage, options) {
     debug2?.("buildNpm start");
     const { build: tsupBuild } = await import("tsup");
     const isDependenciesCacheOutdate = await this.checkDependenciesCacheOutdate();
@@ -833,7 +836,7 @@ var CompilerContext = class {
       const packageJsonPath = import_pathe5.default.resolve(this.cwd, relation.packageJsonPath);
       if (await import_fs_extra5.default.exists(packageJsonPath)) {
         const pkgJson = await import_fs_extra5.default.readJson(packageJsonPath);
-        const outDir = import_pathe5.default.resolve(this.cwd, relation.miniprogramNpmDistDir, "miniprogram_npm");
+        const outDir = import_pathe5.default.resolve(this.cwd, relation.miniprogramNpmDistDir, subPackage?.root ?? "", "miniprogram_npm");
         if (pkgJson.dependencies) {
           const dependencies = Object.keys(pkgJson.dependencies);
           if (dependencies.length > 0) {
@@ -895,7 +898,12 @@ var CompilerContext = class {
     await this.writeDependenciesCache();
     debug2?.("buildNpm end");
   }
-  async usingComponentsHandler(entry, relDir) {
+  /**
+   * @deps [this.scanComponentEntry]
+   * @param entry
+   * @param relDir
+   */
+  async usingComponentsHandler(entry, relDir, subPackageMeta) {
     const { usingComponents } = entry.json;
     if (usingComponents) {
       for (const [, componentUrl] of Object.entries(usingComponents)) {
@@ -906,10 +914,10 @@ var CompilerContext = class {
         if (tokens[0] && (0, import_shared3.isObject)(this.packageJson.dependencies) && Reflect.has(this.packageJson.dependencies, tokens[0])) {
           continue;
         } else if (tokens[0] === "") {
-          await this.scanComponentEntry(componentUrl.substring(1), import_pathe5.default.resolve(this.cwd, this.srcRoot));
+          await this.scanComponentEntry(componentUrl.substring(1), import_pathe5.default.resolve(this.cwd, this.srcRoot), subPackageMeta);
         } else {
           const importee = resolveImportee(componentUrl, entry, this.aliasEntries);
-          await this.scanComponentEntry(importee, relDir);
+          await this.scanComponentEntry(importee, relDir, subPackageMeta);
         }
       }
     }
@@ -919,6 +927,17 @@ var CompilerContext = class {
     this.entries.length = 0;
     this.subPackageMeta = {};
   }
+  // fork() {
+  //   return new CompilerContext({
+  //     cwd: this.cwd,
+  //     inlineConfig: this.inlineConfig,
+  //     isDev: this.isDev,
+  //     mode: this.mode,
+  //     packageJson: this.packageJson,
+  //     platform: this.platform,
+  //     projectConfig: this.projectConfig,
+  //   })
+  // }
   async scanAppEntry() {
     debug2?.("scanAppEntry start");
     this.resetEntries();
@@ -970,14 +989,13 @@ var CompilerContext = class {
               entriesSet: /* @__PURE__ */ new Set(),
               subPackage: sub
             };
-            const scanComponentEntry = this.scanComponentEntry.bind(meta);
             if (Array.isArray(sub.pages)) {
               for (const page of sub.pages) {
-                await scanComponentEntry(import_pathe5.default.join(sub.root, page), appDirname);
+                await this.scanComponentEntry(import_pathe5.default.join(sub.root, page), appDirname, meta);
               }
             }
             if (sub.entry) {
-              await scanComponentEntry(import_pathe5.default.join(sub.root, sub.entry), appDirname);
+              await this.scanComponentEntry(import_pathe5.default.join(sub.root, sub.entry), appDirname, meta);
             }
             this.subPackageMeta[sub.root] = meta;
           } else {
@@ -1006,16 +1024,20 @@ var CompilerContext = class {
   // pages
   // https://developers.weixin.qq.com/miniprogram/dev/framework/structure.html
   // 页面可以没有 JSON
-  async scanComponentEntry(componentEntry, dirname) {
+  async scanComponentEntry(componentEntry, dirname, subPackageMeta) {
+    const meta = subPackageMeta ?? {
+      entriesSet: this.entriesSet,
+      entries: this.entries
+    };
     debug2?.("scanComponentEntry start", componentEntry);
     const baseName = (0, import_shared3.removeExtension)(import_pathe5.default.resolve(dirname, componentEntry));
     const jsEntry = await findJsEntry(baseName);
     const partialEntry = {
       path: jsEntry
     };
-    if (jsEntry && !this.entriesSet.has(jsEntry)) {
-      this.entriesSet.add(jsEntry);
-      this.entries.push(partialEntry);
+    if (jsEntry && !meta.entriesSet.has(jsEntry)) {
+      meta.entriesSet.add(jsEntry);
+      meta.entries.push(partialEntry);
     }
     const configFile = await findJsonEntry(baseName);
     if (configFile) {
@@ -1029,7 +1051,7 @@ var CompilerContext = class {
         partialEntry.jsonPath = jsonFragment.jsonPath;
       }
       if ((0, import_shared3.isObject)(config)) {
-        await this.usingComponentsHandler(jsonFragment, import_pathe5.default.dirname(configFile));
+        await this.usingComponentsHandler(jsonFragment, import_pathe5.default.dirname(configFile), subPackageMeta);
       }
     }
     debug2?.("scanComponentEntry end", componentEntry);
@@ -1054,6 +1076,7 @@ var CompilerContext = class {
           }
         }
       });
+      await this.buildNpm(meta.subPackage);
       const output = await (0, import_vite2.build)(
         inlineConfig
       );

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { PackageJson } from 'pkg-types';
 import { RollupWatcher, RollupOutput } from 'rollup';
-import { P as ProjectConfig, E as Entry, A as AppEntry, S as SubPackageMetaValue, R as ResolvedAlias, M as MpPlatform, C as CompilerContextOptions } from './config-BeFRKLxC.cjs';
+import { P as ProjectConfig, E as Entry, A as AppEntry, S as SubPackageMetaValue, R as ResolvedAlias, M as MpPlatform, C as CompilerContextOptions, a as SubPackage } from './config-DMYZNPWv.cjs';
 import { InlineConfig } from 'vite';
 import { Options } from 'tsup';
 import '@weapp-core/schematics';
@@ -32,6 +32,9 @@ declare class CompilerContext {
     aliasEntries: ResolvedAlias[];
     platform: MpPlatform;
     outputExtensions: OutputExtensions;
+    /**
+     * 不修改 ctx
+     */
     readCommentJson: (filepath: string) => Promise<any>;
     /**
      * esbuild 定义的环境变量
@@ -62,11 +65,16 @@ declare class CompilerContext {
     writeDependenciesCache(): Promise<void>;
     readDependenciesCache(): Promise<any>;
     checkDependenciesCacheOutdate(): Promise<boolean>;
-    buildNpm(options?: Options): Promise<void>;
+    buildNpm(subPackage?: SubPackage, options?: Options): Promise<void>;
+    /**
+     * @deps [this.scanComponentEntry]
+     * @param entry
+     * @param relDir
+     */
     private usingComponentsHandler;
     resetEntries(): void;
     scanAppEntry(): Promise<AppEntry | undefined>;
-    scanComponentEntry(componentEntry: string, dirname: string): Promise<void>;
+    scanComponentEntry(componentEntry: string, dirname: string, subPackageMeta?: SubPackageMetaValue): Promise<void>;
     setRollupWatcher(watcher: RollupWatcher, root?: string): void;
     buildSubPackage(): Promise<void>;
 }

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { PackageJson } from 'pkg-types';
 import { RollupWatcher, RollupOutput } from 'rollup';
-import { P as ProjectConfig, E as Entry, A as AppEntry, S as SubPackageMetaValue, R as ResolvedAlias, M as MpPlatform, C as CompilerContextOptions } from './config-BeFRKLxC.js';
+import { P as ProjectConfig, E as Entry, A as AppEntry, S as SubPackageMetaValue, R as ResolvedAlias, M as MpPlatform, C as CompilerContextOptions, a as SubPackage } from './config-DMYZNPWv.js';
 import { InlineConfig } from 'vite';
 import { Options } from 'tsup';
 import '@weapp-core/schematics';
@@ -32,6 +32,9 @@ declare class CompilerContext {
     aliasEntries: ResolvedAlias[];
     platform: MpPlatform;
     outputExtensions: OutputExtensions;
+    /**
+     * 不修改 ctx
+     */
     readCommentJson: (filepath: string) => Promise<any>;
     /**
      * esbuild 定义的环境变量
@@ -62,11 +65,16 @@ declare class CompilerContext {
     writeDependenciesCache(): Promise<void>;
     readDependenciesCache(): Promise<any>;
     checkDependenciesCacheOutdate(): Promise<boolean>;
-    buildNpm(options?: Options): Promise<void>;
+    buildNpm(subPackage?: SubPackage, options?: Options): Promise<void>;
+    /**
+     * @deps [this.scanComponentEntry]
+     * @param entry
+     * @param relDir
+     */
     private usingComponentsHandler;
     resetEntries(): void;
     scanAppEntry(): Promise<AppEntry | undefined>;
-    scanComponentEntry(componentEntry: string, dirname: string): Promise<void>;
+    scanComponentEntry(componentEntry: string, dirname: string, subPackageMeta?: SubPackageMetaValue): Promise<void>;
     setRollupWatcher(watcher: RollupWatcher, root?: string): void;
     buildSubPackage(): Promise<void>;
 }

package/dist/index.mjs

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

package/dist/json.d.cts

@@ -3,7 +3,7 @@ export { App, Component, Page, Sitemap, Theme } from '@weapp-core/schematics';
 import { CompilerContext } from './index.cjs';
 import 'pkg-types';
 import 'rollup';
-import './config-BeFRKLxC.cjs';
+import './config-DMYZNPWv.cjs';
 import 'vite';
 import 'tsup';
 import 'vite-tsconfig-paths';

package/dist/json.d.ts

@@ -3,7 +3,7 @@ export { App, Component, Page, Sitemap, Theme } from '@weapp-core/schematics';
 import { CompilerContext } from './index.js';
 import 'pkg-types';
 import 'rollup';
-import './config-BeFRKLxC.js';
+import './config-DMYZNPWv.js';
 import 'vite';
 import 'tsup';
 import 'vite-tsconfig-paths';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-vite",
   "type": "module",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "description": "weapp-vite 一个现代化的小程序打包工具",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -74,10 +74,10 @@
     "picomatch": "^4.0.2",
     "tsup": "^8.3.5",
     "vite-tsconfig-paths": "^5.0.1",
-    "@weapp-core/init": "^1.1.6",
-    "@weapp-core/shared": "^1.0.3",
-    "@weapp-core/schematics": "^1.0.3",
+    "@weapp-core/schematics": "^1.0.4",
     "@weapp-core/logger": "^1.0.1",
+    "@weapp-core/shared": "^1.0.3",
+    "@weapp-core/init": "^1.1.6",
     "weapp-ide-cli": "^2.0.6"
   },
   "publishConfig": {
@@ -85,7 +85,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "devDependencies": {
-    "@babel/parser": "^7.26.1",
+    "@babel/parser": "^7.26.2",
     "@babel/traverse": "^7.25.9",
     "htmlparser2": "^9.1.0"
   },