weapp-vite 1.3.1 → 1.3.3

package/dist/{chunk-JB72VL2I.mjs → chunk-EA52OCYF.mjs}

@@ -3,7 +3,7 @@ import logger from "@weapp-core/logger";
 var logger_default = logger;
 
 // package.json
-var version = "1.3.1";
+var version = "1.3.3";
 
 // src/constants.ts
 var VERSION = version;
@@ -303,6 +303,9 @@ function vitePluginWeapp(ctx) {
 // src/context.ts
 var require2 = createRequire(import.meta.url);
 var CompilerContext = class {
+  /**
+   * loadDefaultConfig 的时候会被重新赋予
+   */
   inlineConfig;
   cwd;
   isDev;
@@ -324,7 +327,6 @@ var CompilerContext = class {
       projectConfig: {},
       type: "app",
       inlineConfig: {},
-      mode: "",
       packageJson: {}
     });
     this.cwd = cwd;
@@ -394,8 +396,8 @@ var CompilerContext = class {
       }).on("ready", async () => {
         await this.internalDev(inlineConfig2);
         isReady = true;
-        logger_default.success("\u5E94\u7528\u6784\u5EFA\u5B8C\u6210\uFF01\u6267\u884C `npm run open` \u6253\u5F00\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177");
-        logger_default.success("\u6216\u8005\u4F7F\u7528\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\uFF0C\u5BFC\u5165\u6839\u76EE\u5F55 (`project.config.json` \u6240\u5728\u76EE\u5F55) \u67E5\u770B\u6548\u679C");
+        logger_default.success("\u5E94\u7528\u6784\u5EFA\u5B8C\u6210\uFF01");
+        logger_default.success("\u6267\u884C `npm run open` \u6253\u5F00\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\uFF0C\u6216\u8005\u76F4\u63A5\u6253\u5F00\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\uFF0C\u5BFC\u5165\u6839\u76EE\u5F55( `project.config.json` \u6240\u5728\u76EE\u5F55) \u67E5\u770B\u6548\u679C");
       });
       return watcher;
     };
@@ -491,6 +493,8 @@ var CompilerContext = class {
       mode: this.mode
     }, void 0, this.cwd);
     this.inlineConfig = defu2({
+      configFile: false
+    }, loaded?.config, {
       mode: this.mode,
       build: {
         rollupOptions: {
@@ -517,12 +521,11 @@ var CompilerContext = class {
           include: void 0
         }
       },
-      logLevel: "warn",
       plugins: [
         tsconfigPaths()
       ],
-      configFile: false
-    }, loaded?.config, this.inlineConfig);
+      logLevel: "warn"
+    });
   }
   // https://cn.vitejs.dev/guide/build.html#library-mode
   // miniprogram_dist
@@ -552,7 +555,7 @@ var CompilerContext = class {
             for (const dep of dependencies) {
               const id = `${dep}/package.json`;
               const targetJson = require2(id);
-              if ("miniprogram" in targetJson && targetJson.miniprogram) {
+              if (Reflect.has(targetJson, "miniprogram") && targetJson.miniprogram) {
                 const targetJsonPath = require2.resolve(id);
                 await fs6.copy(
                   path5.resolve(
@@ -603,7 +606,12 @@ var CompilerContext = class {
       }
     }
   }
+  resetEntries() {
+    this.entriesSet.clear();
+    this.entries.length = 0;
+  }
   async scanAppEntry() {
+    this.resetEntries();
     const appDirname = path5.resolve(this.cwd, this.srcRoot);
     const appConfigFile = path5.resolve(appDirname, "app.json");
     const appEntry = await findJsEntry(appConfigFile);

package/dist/cli.cjs

@@ -32,7 +32,7 @@ var import_cac = require("cac");
 var import_weapp_ide_cli = require("weapp-ide-cli");
 
 // package.json
-var version = "1.3.1";
+var version = "1.3.3";
 
 // src/constants.ts
 var VERSION = version;
@@ -336,6 +336,9 @@ function vitePluginWeapp(ctx) {
 // src/context.ts
 var require2 = (0, import_node_module.createRequire)(importMetaUrl);
 var CompilerContext = class {
+  /**
+   * loadDefaultConfig 的时候会被重新赋予
+   */
   inlineConfig;
   cwd;
   isDev;
@@ -357,7 +360,6 @@ var CompilerContext = class {
       projectConfig: {},
       type: "app",
       inlineConfig: {},
-      mode: "",
       packageJson: {}
     });
     this.cwd = cwd;
@@ -427,8 +429,8 @@ var CompilerContext = class {
       }).on("ready", async () => {
         await this.internalDev(inlineConfig2);
         isReady = true;
-        logger_default.success("\u5E94\u7528\u6784\u5EFA\u5B8C\u6210\uFF01\u6267\u884C `npm run open` \u6253\u5F00\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177");
-        logger_default.success("\u6216\u8005\u4F7F\u7528\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\uFF0C\u5BFC\u5165\u6839\u76EE\u5F55 (`project.config.json` \u6240\u5728\u76EE\u5F55) \u67E5\u770B\u6548\u679C");
+        logger_default.success("\u5E94\u7528\u6784\u5EFA\u5B8C\u6210\uFF01");
+        logger_default.success("\u6267\u884C `npm run open` \u6253\u5F00\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\uFF0C\u6216\u8005\u76F4\u63A5\u6253\u5F00\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\uFF0C\u5BFC\u5165\u6839\u76EE\u5F55( `project.config.json` \u6240\u5728\u76EE\u5F55) \u67E5\u770B\u6548\u679C");
       });
       return watcher;
     };
@@ -524,6 +526,8 @@ var CompilerContext = class {
       mode: this.mode
     }, void 0, this.cwd);
     this.inlineConfig = (0, import_shared3.defu)({
+      configFile: false
+    }, loaded?.config, {
       mode: this.mode,
       build: {
         rollupOptions: {
@@ -550,12 +554,11 @@ var CompilerContext = class {
           include: void 0
         }
       },
-      logLevel: "warn",
       plugins: [
         (0, import_vite_tsconfig_paths.default)()
       ],
-      configFile: false
-    }, loaded?.config, this.inlineConfig);
+      logLevel: "warn"
+    });
   }
   // https://cn.vitejs.dev/guide/build.html#library-mode
   // miniprogram_dist
@@ -585,7 +588,7 @@ var CompilerContext = class {
             for (const dep of dependencies) {
               const id = `${dep}/package.json`;
               const targetJson = require2(id);
-              if ("miniprogram" in targetJson && targetJson.miniprogram) {
+              if (Reflect.has(targetJson, "miniprogram") && targetJson.miniprogram) {
                 const targetJsonPath = require2.resolve(id);
                 await import_fs_extra6.default.copy(
                   import_pathe5.default.resolve(
@@ -636,7 +639,12 @@ var CompilerContext = class {
       }
     }
   }
+  resetEntries() {
+    this.entriesSet.clear();
+    this.entries.length = 0;
+  }
   async scanAppEntry() {
+    this.resetEntries();
     const appDirname = import_pathe5.default.resolve(this.cwd, this.srcRoot);
     const appConfigFile = import_pathe5.default.resolve(appDirname, "app.json");
     const appEntry = await findJsEntry(appConfigFile);

package/dist/cli.mjs

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

package/dist/index.cjs

@@ -340,6 +340,9 @@ function vitePluginWeapp(ctx) {
 // src/context.ts
 var require2 = (0, import_node_module.createRequire)(importMetaUrl);
 var CompilerContext = class {
+  /**
+   * loadDefaultConfig 的时候会被重新赋予
+   */
   inlineConfig;
   cwd;
   isDev;
@@ -361,7 +364,6 @@ var CompilerContext = class {
       projectConfig: {},
       type: "app",
       inlineConfig: {},
-      mode: "",
       packageJson: {}
     });
     this.cwd = cwd;
@@ -431,8 +433,8 @@ var CompilerContext = class {
       }).on("ready", async () => {
         await this.internalDev(inlineConfig2);
         isReady = true;
-        logger_default.success("\u5E94\u7528\u6784\u5EFA\u5B8C\u6210\uFF01\u6267\u884C `npm run open` \u6253\u5F00\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177");
-        logger_default.success("\u6216\u8005\u4F7F\u7528\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\uFF0C\u5BFC\u5165\u6839\u76EE\u5F55 (`project.config.json` \u6240\u5728\u76EE\u5F55) \u67E5\u770B\u6548\u679C");
+        logger_default.success("\u5E94\u7528\u6784\u5EFA\u5B8C\u6210\uFF01");
+        logger_default.success("\u6267\u884C `npm run open` \u6253\u5F00\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\uFF0C\u6216\u8005\u76F4\u63A5\u6253\u5F00\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\uFF0C\u5BFC\u5165\u6839\u76EE\u5F55( `project.config.json` \u6240\u5728\u76EE\u5F55) \u67E5\u770B\u6548\u679C");
       });
       return watcher;
     };
@@ -528,6 +530,8 @@ var CompilerContext = class {
       mode: this.mode
     }, void 0, this.cwd);
     this.inlineConfig = (0, import_shared3.defu)({
+      configFile: false
+    }, loaded?.config, {
       mode: this.mode,
       build: {
         rollupOptions: {
@@ -554,12 +558,11 @@ var CompilerContext = class {
           include: void 0
         }
       },
-      logLevel: "warn",
       plugins: [
         (0, import_vite_tsconfig_paths.default)()
       ],
-      configFile: false
-    }, loaded?.config, this.inlineConfig);
+      logLevel: "warn"
+    });
   }
   // https://cn.vitejs.dev/guide/build.html#library-mode
   // miniprogram_dist
@@ -589,7 +592,7 @@ var CompilerContext = class {
             for (const dep of dependencies) {
               const id = `${dep}/package.json`;
               const targetJson = require2(id);
-              if ("miniprogram" in targetJson && targetJson.miniprogram) {
+              if (Reflect.has(targetJson, "miniprogram") && targetJson.miniprogram) {
                 const targetJsonPath = require2.resolve(id);
                 await import_fs_extra6.default.copy(
                   import_pathe5.default.resolve(
@@ -640,7 +643,12 @@ var CompilerContext = class {
       }
     }
   }
+  resetEntries() {
+    this.entriesSet.clear();
+    this.entries.length = 0;
+  }
   async scanAppEntry() {
+    this.resetEntries();
     const appDirname = import_pathe5.default.resolve(this.cwd, this.srcRoot);
     const appConfigFile = import_pathe5.default.resolve(appDirname, "app.json");
     const appEntry = await findJsEntry(appConfigFile);

package/dist/index.d.cts

@@ -32,6 +32,9 @@ interface CompilerContextOptions {
     subPackage?: SubPackage;
 }
 declare class CompilerContext {
+    /**
+     * loadDefaultConfig 的时候会被重新赋予
+     */
     inlineConfig: InlineConfig;
     cwd: string;
     isDev: boolean;
@@ -59,6 +62,7 @@ declare class CompilerContext {
         sourcemap?: boolean;
     }): Promise<void>;
     private usingComponentsHandler;
+    resetEntries(): void;
     scanAppEntry(): Promise<void>;
     scanComponentEntry(componentEntry: string, dirname: string): Promise<void>;
 }

package/dist/index.d.ts

@@ -32,6 +32,9 @@ interface CompilerContextOptions {
     subPackage?: SubPackage;
 }
 declare class CompilerContext {
+    /**
+     * loadDefaultConfig 的时候会被重新赋予
+     */
     inlineConfig: InlineConfig;
     cwd: string;
     isDev: boolean;
@@ -59,6 +62,7 @@ declare class CompilerContext {
         sourcemap?: boolean;
     }): Promise<void>;
     private usingComponentsHandler;
+    resetEntries(): void;
     scanAppEntry(): Promise<void>;
     scanComponentEntry(componentEntry: string, dirname: string): Promise<void>;
 }

package/dist/index.mjs

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-vite",
   "type": "module",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "weapp-vite 一个现代化的小程序打包工具",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -63,8 +63,8 @@
     "vite-tsconfig-paths": "^5.0.1",
     "@weapp-core/init": "^1.0.5",
     "@weapp-core/logger": "^1.0.1",
-    "@weapp-core/shared": "^1.0.1",
-    "weapp-ide-cli": "^2.0.6"
+    "weapp-ide-cli": "^2.0.6",
+    "@weapp-core/shared": "^1.0.1"
   },
   "publishConfig": {
     "access": "public",