weapp-vite 1.2.1 → 1.2.3

package/dist/{chunk-5SFYACIL.mjs → chunk-MFE5RFWP.mjs}

@@ -3,7 +3,7 @@ import logger from "@weapp-core/logger";
 var logger_default = logger;
 
 // package.json
-var version = "1.2.1";
+var version = "1.2.3";
 
 // src/constants.ts
 var VERSION = version;
@@ -16,6 +16,7 @@ import { addExtension as addExtension3, defu as defu3, removeExtension as remove
 import { watch } from "chokidar";
 import fs4 from "fs-extra";
 import path5 from "pathe";
+import { build as tsupBuild } from "tsup";
 import { build, loadConfigFromFile } from "vite";
 import tsconfigPaths from "vite-tsconfig-paths";
 
@@ -584,7 +585,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
         },
@@ -652,10 +655,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) {
@@ -707,9 +724,6 @@ var CompilerContext = class _CompilerContext {
         commonjsOptions: {
           transformMixedEsModules: true,
           include: void 0
-        },
-        watch: {
-          exclude: ["node_modules/**", this.mpDistRoot ? path5.join(this.mpDistRoot, "**") : "dist/**"]
         }
       },
       logLevel: "info",
@@ -723,7 +737,8 @@ var CompilerContext = class _CompilerContext {
   // 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() {
+  async buildNpm(options) {
+    const { sourcemap } = defu3(options, { sourcemap: true });
     let packNpmRelationList = [];
     if (this.projectConfig.setting?.packNpmManually && Array.isArray(this.projectConfig.setting.packNpmRelationList)) {
       packNpmRelationList = this.projectConfig.setting.packNpmRelationList;
@@ -756,25 +771,20 @@ var CompilerContext = class _CompilerContext {
                   path5.join(outDir, dep)
                 );
               } else {
-                await build({
-                  build: {
-                    sourcemap: true,
-                    outDir: path5.join(outDir, dep),
-                    minify: false,
-                    rollupOptions: {
-                      input: {
-                        index: require2.resolve(dep)
-                      },
-                      output: {
-                        format: "cjs",
-                        strict: false,
-                        entryFileNames: "[name].js"
-                      }
-                      // logLevel: 'silent',
-                    },
-                    assetsDir: "."
+                await tsupBuild({
+                  entry: {
+                    index: require2.resolve(dep)
+                  },
+                  format: ["cjs"],
+                  outDir: path5.join(outDir, dep),
+                  silent: true,
+                  shims: true,
+                  outExtension: () => {
+                    return {
+                      js: ".js"
+                    };
                   },
-                  logLevel: "error"
+                  sourcemap
                 });
               }
               logger_default.success(`${dep} \u4F9D\u8D56\u5904\u7406\u5B8C\u6210!`);

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.1";
+var version = "1.2.3";
 
 // src/constants.ts
 var VERSION = version;
@@ -46,6 +46,7 @@ var import_shared4 = require("@weapp-core/shared");
 var import_chokidar = require("chokidar");
 var import_fs_extra4 = __toESM(require("fs-extra"), 1);
 var import_pathe5 = __toESM(require("pathe"), 1);
+var import_tsup = require("tsup");
 var import_vite2 = require("vite");
 var import_vite_tsconfig_paths = __toESM(require("vite-tsconfig-paths"), 1);
 
@@ -618,7 +619,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
         },
@@ -686,10 +689,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) {
@@ -741,9 +758,6 @@ 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",
@@ -757,7 +771,8 @@ var CompilerContext = class _CompilerContext {
   // 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() {
+  async buildNpm(options) {
+    const { sourcemap } = (0, import_shared4.defu)(options, { sourcemap: true });
     let packNpmRelationList = [];
     if (this.projectConfig.setting?.packNpmManually && Array.isArray(this.projectConfig.setting.packNpmRelationList)) {
       packNpmRelationList = this.projectConfig.setting.packNpmRelationList;
@@ -790,25 +805,20 @@ var CompilerContext = class _CompilerContext {
                   import_pathe5.default.join(outDir, dep)
                 );
               } else {
-                await (0, import_vite2.build)({
-                  build: {
-                    sourcemap: true,
-                    outDir: import_pathe5.default.join(outDir, dep),
-                    minify: false,
-                    rollupOptions: {
-                      input: {
-                        index: require2.resolve(dep)
-                      },
-                      output: {
-                        format: "cjs",
-                        strict: false,
-                        entryFileNames: "[name].js"
-                      }
-                      // logLevel: 'silent',
-                    },
-                    assetsDir: "."
+                await (0, import_tsup.build)({
+                  entry: {
+                    index: require2.resolve(dep)
+                  },
+                  format: ["cjs"],
+                  outDir: import_pathe5.default.join(outDir, dep),
+                  silent: true,
+                  shims: true,
+                  outExtension: () => {
+                    return {
+                      js: ".js"
+                    };
                   },
-                  logLevel: "error"
+                  sourcemap
                 });
               }
               logger_default.success(`${dep} \u4F9D\u8D56\u5904\u7406\u5B8C\u6210!`);
@@ -838,7 +848,7 @@ function convertBase(v) {
 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").action(async (root, options) => {
+cli.command("[root]", "start dev server").alias("serve").alias("dev").option("--skipNpm", `[boolean] if skip npm build`).action(async (root, options) => {
   filterDuplicateOptions(options);
   const ctx = new CompilerContext({
     cwd: root,
@@ -846,7 +856,9 @@ cli.command("[root]", "start dev server").alias("serve").alias("dev").action(asy
     isDev: true
   });
   await ctx.loadDefaultConfig();
-  await ctx.buildNpm();
+  if (!options.skipNpm) {
+    await ctx.buildNpm();
+  }
   await ctx.runDev();
 });
 cli.command("build [root]", "build for production").option("--target <target>", `[string] transpile target (default: 'modules')`).option("--outDir <dir>", `[string] output directory (default: dist)`).option(
@@ -858,15 +870,17 @@ 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`).action(async (root, options) => {
+).option("-w, --watch", `[boolean] rebuilds when modules have changed on disk`).option("--skipNpm", `[boolean] if skip npm build`).action(async (root, options) => {
   filterDuplicateOptions(options);
   const ctx = new CompilerContext({
     cwd: root,
     mode: options.mode
   });
   await ctx.loadDefaultConfig();
-  await ctx.buildNpm();
   await ctx.runProd();
+  if (!options.skipNpm) {
+    await ctx.buildNpm({ sourcemap: false });
+  }
 });
 cli.command("init").action(() => {
   try {

package/dist/cli.mjs

@@ -2,7 +2,7 @@ import {
   CompilerContext,
   VERSION,
   logger_default
-} from "./chunk-5SFYACIL.mjs";
+} from "./chunk-MFE5RFWP.mjs";
 import "./chunk-444MQSSG.mjs";
 
 // src/cli.ts
@@ -27,7 +27,7 @@ function convertBase(v) {
 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").action(async (root, options) => {
+cli.command("[root]", "start dev server").alias("serve").alias("dev").option("--skipNpm", `[boolean] if skip npm build`).action(async (root, options) => {
   filterDuplicateOptions(options);
   const ctx = new CompilerContext({
     cwd: root,
@@ -35,7 +35,9 @@ cli.command("[root]", "start dev server").alias("serve").alias("dev").action(asy
     isDev: true
   });
   await ctx.loadDefaultConfig();
-  await ctx.buildNpm();
+  if (!options.skipNpm) {
+    await ctx.buildNpm();
+  }
   await ctx.runDev();
 });
 cli.command("build [root]", "build for production").option("--target <target>", `[string] transpile target (default: 'modules')`).option("--outDir <dir>", `[string] output directory (default: dist)`).option(
@@ -47,15 +49,17 @@ 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`).action(async (root, options) => {
+).option("-w, --watch", `[boolean] rebuilds when modules have changed on disk`).option("--skipNpm", `[boolean] if skip npm build`).action(async (root, options) => {
   filterDuplicateOptions(options);
   const ctx = new CompilerContext({
     cwd: root,
     mode: options.mode
   });
   await ctx.loadDefaultConfig();
-  await ctx.buildNpm();
   await ctx.runProd();
+  if (!options.skipNpm) {
+    await ctx.buildNpm({ sourcemap: false });
+  }
 });
 cli.command("init").action(() => {
   try {

package/dist/index.cjs

@@ -45,6 +45,7 @@ var import_shared4 = require("@weapp-core/shared");
 var import_chokidar = require("chokidar");
 var import_fs_extra4 = __toESM(require("fs-extra"), 1);
 var import_pathe5 = __toESM(require("pathe"), 1);
+var import_tsup = require("tsup");
 var import_vite2 = require("vite");
 var import_vite_tsconfig_paths = __toESM(require("vite-tsconfig-paths"), 1);
 
@@ -620,7 +621,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
         },
@@ -688,10 +691,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) {
@@ -743,9 +760,6 @@ 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",
@@ -759,7 +773,8 @@ var CompilerContext = class _CompilerContext {
   // 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() {
+  async buildNpm(options) {
+    const { sourcemap } = (0, import_shared4.defu)(options, { sourcemap: true });
     let packNpmRelationList = [];
     if (this.projectConfig.setting?.packNpmManually && Array.isArray(this.projectConfig.setting.packNpmRelationList)) {
       packNpmRelationList = this.projectConfig.setting.packNpmRelationList;
@@ -792,25 +807,20 @@ var CompilerContext = class _CompilerContext {
                   import_pathe5.default.join(outDir, dep)
                 );
               } else {
-                await (0, import_vite2.build)({
-                  build: {
-                    sourcemap: true,
-                    outDir: import_pathe5.default.join(outDir, dep),
-                    minify: false,
-                    rollupOptions: {
-                      input: {
-                        index: require2.resolve(dep)
-                      },
-                      output: {
-                        format: "cjs",
-                        strict: false,
-                        entryFileNames: "[name].js"
-                      }
-                      // logLevel: 'silent',
-                    },
-                    assetsDir: "."
+                await (0, import_tsup.build)({
+                  entry: {
+                    index: require2.resolve(dep)
+                  },
+                  format: ["cjs"],
+                  outDir: import_pathe5.default.join(outDir, dep),
+                  silent: true,
+                  shims: true,
+                  outExtension: () => {
+                    return {
+                      js: ".js"
+                    };
                   },
-                  logLevel: "error"
+                  sourcemap
                 });
               }
               logger_default.success(`${dep} \u4F9D\u8D56\u5904\u7406\u5B8C\u6210!`);

package/dist/index.d.cts

@@ -45,10 +45,12 @@ 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>;
+    buildNpm(options?: {
+        sourcemap?: boolean;
+    }): Promise<void>;
 }
 
 export { CompilerContext, type CompilerContextOptions };

package/dist/index.d.ts

@@ -45,10 +45,12 @@ 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>;
+    buildNpm(options?: {
+        sourcemap?: boolean;
+    }): Promise<void>;
 }
 
 export { CompilerContext, type CompilerContextOptions };

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import {
   CompilerContext
-} from "./chunk-5SFYACIL.mjs";
+} from "./chunk-MFE5RFWP.mjs";
 import "./chunk-444MQSSG.mjs";
 export {
   CompilerContext

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-vite",
   "type": "module",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "weapp-vite 一个现代化的小程序打包工具",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -53,6 +53,7 @@
     "cac": "^6.7.14",
     "chokidar": "^3.6.0",
     "debug": "^4.3.7",
+    "esbuild": "^0.24.0",
     "fast-glob": "^3.3.2",
     "fdir": "^6.3.0",
     "fs-extra": "^11.2.0",
@@ -62,10 +63,12 @@
     "pathe": "^1.1.2",
     "picocolors": "^1.1.0",
     "pkg-types": "^1.2.0",
+    "rollup": "^4.22.4",
+    "tsup": "^8.3.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/logger": "^1.0.1",
     "weapp-ide-cli": "^2.0.5"
   },
   "publishConfig": {