weapp-vite 2.0.2 → 2.1.1

package/dist/cli.cjs

@@ -29,10 +29,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../../node_modules/.pnpm/tsup@8.3.5_@swc+core@1.10.4_jiti@2.4.2_postcss@8.4.49_tsx@4.19.2_typescript@5.7.3_yaml@2.7.0/node_modules/tsup/assets/cjs_shims.js
+// ../../node_modules/.pnpm/tsup@8.3.5_@swc+core@1.10.7_jiti@2.4.2_postcss@8.4.49_tsx@4.19.2_typescript@5.7.3_yaml@2.7.0/node_modules/tsup/assets/cjs_shims.js
 var getImportMetaUrl, importMetaUrl;
 var init_cjs_shims = __esm({
-  "../../node_modules/.pnpm/tsup@8.3.5_@swc+core@1.10.4_jiti@2.4.2_postcss@8.4.49_tsx@4.19.2_typescript@5.7.3_yaml@2.7.0/node_modules/tsup/assets/cjs_shims.js"() {
+  "../../node_modules/.pnpm/tsup@8.3.5_@swc+core@1.10.7_jiti@2.4.2_postcss@8.4.49_tsx@4.19.2_typescript@5.7.3_yaml@2.7.0/node_modules/tsup/assets/cjs_shims.js"() {
     "use strict";
     getImportMetaUrl = /* @__PURE__ */ __name(() => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href, "getImportMetaUrl");
     importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
@@ -4235,8 +4235,8 @@ var AutoImportService2 = class {
     }
   }
   filter(id, _meta) {
-    if (this.configService.inlineConfig.weapp?.enhance?.autoImportComponents?.globs) {
-      const isMatch = (0, import_picomatch.default)(this.configService.inlineConfig.weapp.enhance.autoImportComponents.globs, {
+    if (this.configService.weappViteConfig?.enhance?.autoImportComponents?.globs) {
+      const isMatch = (0, import_picomatch.default)(this.configService.weappViteConfig.enhance.autoImportComponents.globs, {
         cwd: this.configService.cwd,
         windows: true,
         posixSlashes: true
@@ -14840,7 +14840,7 @@ var debouncedLoggerSuccess = (0, import_debounce.default)((message) => {
   return logger_default.success(message);
 }, 25);
 function vitePluginWeapp(ctx, subPackageMeta) {
-  const { configService, subPackageService, autoImportService, scanService, wxmlService } = ctx;
+  const { configService, subPackageService, autoImportService, scanService, wxmlService, jsonService } = ctx;
   let configResolved;
   function getInputOption(entries2) {
     return entries2.reduce((acc, cur) => {
@@ -14853,6 +14853,7 @@ function vitePluginWeapp(ctx, subPackageMeta) {
   let entries;
   const cachedEmittedFiles = [];
   const cachedWatchFiles = [];
+  const cachedWorkerFiles = [];
   async function handleWxsDeps(deps, absPath) {
     for (const wxsDep of deps.filter((x4) => x4.tagName === "wxs")) {
       if (jsExtensions.includes(wxsDep.attrs.lang) || /\.wxs\.[jt]s$/.test(wxsDep.value)) {
@@ -14915,8 +14916,12 @@ function vitePluginWeapp(ctx, subPackageMeta) {
         }
       },
       async options(options) {
+        if (!subPackageMeta) {
+          await scanService.loadAppEntry();
+        }
         cachedEmittedFiles.length = 0;
         cachedWatchFiles.length = 0;
+        cachedWorkerFiles.length = 0;
         scanService.resetAutoImport();
         const { build: build4, weapp } = configResolved;
         const ignore = [
@@ -14934,6 +14939,9 @@ function vitePluginWeapp(ctx, subPackageMeta) {
           "**/*.{wxml,html,wxs}",
           "**/*.{png,jpg,jpeg,gif,svg,webp}"
         ];
+        if (scanService.workersDir) {
+          assetGlobs.push(import_pathe6.default.join(scanService.workersDir, "**/*.{js,ts}"));
+        }
         assetGlobs.push(...resolveGlobs(weapp?.copy?.include));
         const patterns = assetGlobs.map((x4) => {
           return import_pathe6.default.join(targetDir, x4);
@@ -14951,6 +14959,7 @@ function vitePluginWeapp(ctx, subPackageMeta) {
           const absPath = import_pathe6.default.resolve(configService.cwd, relPath);
           cachedWatchFiles.push(absPath);
           const isWxs = relPath.endsWith(".wxs");
+          const isWorker = isJsOrTs(relPath) && scanService.workersDir && relPath.startsWith(scanService.workersDir);
           const fileName = configService.relativeSrcRoot(relPath);
           if (isTemplateRequest(relPath)) {
             if (weapp?.enhance?.autoImportComponents && autoImportService.filter(relPath, subPackageMeta)) {
@@ -14967,6 +14976,12 @@ function vitePluginWeapp(ctx, subPackageMeta) {
               absPath,
               fileName
             });
+          } else if (isWorker) {
+            cachedWorkerFiles.push({
+              relPath,
+              absPath,
+              fileName
+            });
           } else {
             mediaFiles.push({
               relPath,
@@ -15005,7 +15020,7 @@ function vitePluginWeapp(ctx, subPackageMeta) {
             return !wxmlService.tokenMap.has(x4.absPath);
           });
           const additionalWxmlFiles = excludedWxmlFiles.filter((x4) => {
-            return configService.inlineConfig.weapp?.isAdditionalWxml?.(x4.absPath);
+            return configService.weappViteConfig?.isAdditionalWxml?.(x4.absPath);
           });
           debug2?.(`additionalWxmlFiles:`, additionalWxmlFiles);
           await Promise.all([
@@ -15067,7 +15082,7 @@ function vitePluginWeapp(ctx, subPackageMeta) {
               this.emitFile({
                 type: "asset",
                 fileName,
-                source: resolveJson(entry, configService.aliasEntries)
+                source: jsonService.resolve(entry)
               });
             }
           }
@@ -15081,10 +15096,10 @@ function vitePluginWeapp(ctx, subPackageMeta) {
                   this.emitFile({
                     type: "asset",
                     fileName,
-                    source: resolveJson({
+                    source: jsonService.resolve({
                       json: appEntry.sitemapJson,
                       jsonPath: appEntry.sitemapJsonPath
-                    }, configService.aliasEntries)
+                    })
                   });
                 }
               }
@@ -15095,16 +15110,30 @@ function vitePluginWeapp(ctx, subPackageMeta) {
                   this.emitFile({
                     type: "asset",
                     fileName,
-                    source: resolveJson({
+                    source: jsonService.resolve({
                       json: appEntry.themeJson,
                       jsonPath: appEntry.themeJsonPath
-                    }, configService.aliasEntries)
+                    })
                   });
                 }
               }
             }
           }
         }
+        if (scanService.workersDir && cachedWorkerFiles.length) {
+          const workerFiles = scanService.workersBuild(cachedWorkerFiles.map((x4) => x4.absPath));
+          if (workerFiles) {
+            for (let i2 = 0; i2 < workerFiles.length; i2++) {
+              const workerFile = workerFiles[i2];
+              const fileName = configService.relativeSrcRoot(configService.relativeCwd(cachedWorkerFiles[i2].absPath));
+              this.emitFile({
+                type: "prebuilt-chunk",
+                fileName,
+                code: workerFile.text
+              });
+            }
+          }
+        }
         debug2?.("buildEnd end");
       },
       resolveId(source) {
@@ -15359,6 +15388,9 @@ var ConfigService2 = class {
   get inlineConfig() {
     return this.options.config;
   }
+  get weappViteConfig() {
+    return this.inlineConfig.weapp;
+  }
   get packageJson() {
     return this.options.packageJson;
   }
@@ -15914,6 +15946,9 @@ var JsonService2 = class {
       logger_default.error(error);
     }
   }
+  resolve(entry) {
+    return resolveJson(entry, this.configService.aliasEntries);
+  }
 };
 JsonService2 = _ts_decorate5([
   Kt(),
@@ -23165,9 +23200,11 @@ var NpmService2 = class {
                   // https://tsup.egoist.dev/#compile-time-environment-variables
                   env: {
                     NODE_ENV: "production"
-                  }
+                  },
+                  minify: true,
+                  target: "es6"
                 });
-                const resolvedOptions = this.configService.inlineConfig.weapp?.npm?.tsup?.(mergedOptions, {
+                const resolvedOptions = this.configService.weappViteConfig?.npm?.tsup?.(mergedOptions, {
                   entry: index,
                   name: dep
                 });
@@ -23203,6 +23240,7 @@ init_cjs_shims();
 var import_shared16 = require("@weapp-core/shared");
 var import_fs_extra7 = __toESM(require("fs-extra"), 1);
 var import_pathe10 = __toESM(require("pathe"), 1);
+var import_ts_morph = require("ts-morph");
 function _ts_decorate7(decorators, target, key, desc) {
   var c3 = arguments.length, r5 = c3 < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d3;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r5 = Reflect.decorate(decorators, target, key, desc);
@@ -23300,9 +23338,7 @@ var ScanService2 = class {
     this.autoImportService.potentialComponentMap.clear();
     this.wxmlService.wxmlComponentsMap.clear();
   }
-  async scanAppEntry() {
-    debug?.("scanAppEntry start");
-    this.resetEntries();
+  async loadAppEntry() {
     const appDirname = import_pathe10.default.resolve(this.configService.cwd, this.configService.srcRoot);
     const appBasename = import_pathe10.default.resolve(appDirname, "app");
     const appConfigFile = await findJsonEntry(appBasename);
@@ -23310,20 +23346,14 @@ var ScanService2 = class {
     if (appEntryPath && appConfigFile) {
       const config = await this.jsonService.read(appConfigFile);
       if ((0, import_shared16.isObject)(config)) {
-        if (this.entriesSet.has(appEntryPath)) {
-          return;
-        }
-        this.entriesSet.add(appEntryPath);
         const appEntry = {
           path: appEntryPath,
           json: config,
           jsonPath: appConfigFile,
           type: "app"
         };
-        this.entries.push(appEntry);
         this.appEntry = appEntry;
-        this.pagesSet = this.initPagesSet();
-        const { pages, subpackages = [], subPackages = [], sitemapLocation = "sitemap.json", themeLocation = "theme.json" } = config;
+        const { sitemapLocation = "sitemap.json", themeLocation = "theme.json" } = config;
         if (sitemapLocation) {
           const sitemapJsonPath = await findJsonEntry(import_pathe10.default.resolve(appDirname, sitemapLocation));
           if (sitemapJsonPath) {
@@ -23338,58 +23368,75 @@ var ScanService2 = class {
             appEntry.themeJson = await this.jsonService.read(themeJsonPath);
           }
         }
-        const subs = [
-          ...subpackages,
-          ...subPackages
-        ];
-        await this.usingComponentsHandler(appEntry, appDirname);
-        if (Array.isArray(pages)) {
-          for (const page of pages) {
-            await this.scanComponentEntry(page, appDirname);
-          }
+        return appEntry;
+      }
+    } else {
+      throw new Error(`\u5728 ${appDirname} \u76EE\u5F55\u4E0B\u6CA1\u6709\u627E\u5230 \`app.json\`, \u8BF7\u786E\u4FDD\u4F60\u521D\u59CB\u5316\u4E86\u5C0F\u7A0B\u5E8F\u9879\u76EE\uFF0C\u6216\u8005\u5728 \`vite.config.ts\` \u4E2D\u8BBE\u7F6E\u7684\u6B63\u786E\u7684 \`weapp.srcRoot\` \u914D\u7F6E\u8DEF\u5F84  `);
+    }
+  }
+  async scanAppEntry() {
+    debug?.("scanAppEntry start");
+    this.resetEntries();
+    const appDirname = import_pathe10.default.resolve(this.configService.cwd, this.configService.srcRoot);
+    if (this.appEntry) {
+      const { path: appEntryPath, json: config } = this.appEntry;
+      if (this.entriesSet.has(appEntryPath)) {
+        return;
+      }
+      this.entriesSet.add(appEntryPath);
+      this.entries.push(this.appEntry);
+      this.pagesSet = this.initPagesSet();
+      const { pages, subpackages = [], subPackages = [] } = config;
+      const subs = [
+        ...subpackages,
+        ...subPackages
+      ];
+      await this.usingComponentsHandler(this.appEntry, appDirname);
+      if (Array.isArray(pages)) {
+        for (const page of pages) {
+          await this.scanComponentEntry(page, appDirname);
         }
-        for (const sub of subs) {
-          if (sub.independent || this.configService.inlineConfig.weapp?.subPackages?.[sub.root]?.independent) {
-            const meta = {
-              entries: [],
-              entriesSet: /* @__PURE__ */ new Set(),
-              // 合并选项
-              subPackage: {
-                ...sub,
-                dependencies: this.configService.inlineConfig.weapp?.subPackages?.[sub.root].dependencies
-              }
-            };
-            if (Array.isArray(sub.pages)) {
-              for (const page of sub.pages) {
-                await this.scanComponentEntry(import_pathe10.default.join(sub.root, page), appDirname, meta);
-              }
-            }
-            if (sub.entry) {
-              await this.scanComponentEntry(import_pathe10.default.join(sub.root, sub.entry), appDirname, meta);
+      }
+      for (const sub of subs) {
+        if (sub.independent || this.configService.weappViteConfig?.subPackages?.[sub.root]?.independent) {
+          const meta = {
+            entries: [],
+            entriesSet: /* @__PURE__ */ new Set(),
+            // 合并选项
+            subPackage: {
+              ...sub,
+              dependencies: this.configService.weappViteConfig?.subPackages?.[sub.root].dependencies
             }
-            this.subPackageService.metaMap[sub.root] = meta;
-          } else {
-            if (Array.isArray(sub.pages)) {
-              for (const page of sub.pages) {
-                await this.scanComponentEntry(import_pathe10.default.join(sub.root, page), appDirname);
-              }
+          };
+          if (Array.isArray(sub.pages)) {
+            for (const page of sub.pages) {
+              await this.scanComponentEntry(import_pathe10.default.join(sub.root, page), appDirname, meta);
             }
-            if (sub.entry) {
-              await this.scanComponentEntry(import_pathe10.default.join(sub.root, sub.entry), appDirname);
+          }
+          if (sub.entry) {
+            await this.scanComponentEntry(import_pathe10.default.join(sub.root, sub.entry), appDirname, meta);
+          }
+          this.subPackageService.metaMap[sub.root] = meta;
+        } else {
+          if (Array.isArray(sub.pages)) {
+            for (const page of sub.pages) {
+              await this.scanComponentEntry(import_pathe10.default.join(sub.root, page), appDirname);
             }
           }
+          if (sub.entry) {
+            await this.scanComponentEntry(import_pathe10.default.join(sub.root, sub.entry), appDirname);
+          }
         }
-        if ((0, import_shared16.get)(appEntry, "json.tabBar.custom")) {
-          await this.scanComponentEntry("custom-tab-bar/index", appDirname);
-        }
-        if ((0, import_shared16.get)(appEntry, "json.appBar")) {
-          await this.scanComponentEntry("app-bar/index", appDirname);
-        }
-        debug?.("scanAppEntry end");
-        return appEntry;
       }
+      if ((0, import_shared16.get)(this.appEntry, "json.tabBar.custom")) {
+        await this.scanComponentEntry("custom-tab-bar/index", appDirname);
+      }
+      if ((0, import_shared16.get)(this.appEntry, "json.appBar")) {
+        await this.scanComponentEntry("app-bar/index", appDirname);
+      }
+      debug?.("scanAppEntry end");
     } else {
-      throw new Error(`\u5728 ${appDirname} \u76EE\u5F55\u4E0B\u6CA1\u6709\u627E\u5230 \`app.json\`, \u8BF7\u786E\u4FDD\u4F60\u521D\u59CB\u5316\u4E86\u5C0F\u7A0B\u5E8F\u9879\u76EE\uFF0C\u6216\u8005\u5728 \`vite.config.ts\` \u4E2D\u8BBE\u7F6E\u7684\u6B63\u786E\u7684 \`weapp.srcRoot\` \u914D\u7F6E\u8DEF\u5F84  `);
+      throw new Error(`\u6CA1\u6709\u5148\u6267\u884C loadAppEntry \u65B9\u6CD5\u52A0\u8F7D\u5168\u5C40 app.json \u914D\u7F6E`);
     }
   }
   // usingComponents
@@ -23479,8 +23526,8 @@ var ScanService2 = class {
             }
             (0, import_shared16.set)(jsonFragment.json, `usingComponents.${value.name}`, value.from);
           }
-        } else if (Array.isArray(this.configService.inlineConfig.weapp?.enhance?.autoImportComponents?.resolvers)) {
-          for (const resolver of this.configService.inlineConfig.weapp.enhance.autoImportComponents.resolvers) {
+        } else if (Array.isArray(this.configService.weappViteConfig?.enhance?.autoImportComponents?.resolvers)) {
+          for (const resolver of this.configService.weappViteConfig.enhance.autoImportComponents.resolvers) {
             const value = resolver(depComponentName, baseName);
             if (value) {
               if (!((0, import_shared16.isObject)(jsonFragment.json.usingComponents) && Reflect.has(jsonFragment.json.usingComponents, value.name))) {
@@ -23497,6 +23544,38 @@ var ScanService2 = class {
     }
     debug?.("scanComponentEntry end", componentEntry, partialEntry);
   }
+  // https://developers.weixin.qq.com/miniprogram/dev/framework/workers.html
+  get workersOptions() {
+    return this.appEntry?.json?.workers;
+  }
+  get workersDir() {
+    return typeof this.workersOptions === "object" ? this.workersOptions.path : this.workersOptions;
+  }
+  // https://cn.vitejs.dev/guide/build.html#library-mode
+  // 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
+  // #endregion
+  workersBuild(files) {
+    if (this.workersDir && files.length) {
+      const project = new import_ts_morph.Project({
+        compilerOptions: {
+          target: import_ts_morph.ScriptTarget.ES5,
+          module: import_ts_morph.ModuleKind.CommonJS,
+          outDir: import_pathe10.default.resolve(this.configService.outDir, this.workersDir),
+          strict: true,
+          allowJs: true
+        },
+        skipAddingFilesFromTsConfig: true
+      });
+      for (const file of files) {
+        project.addSourceFileAtPath(file);
+      }
+      const result = project.emitToMemory();
+      const sourceFiles = result.getFiles();
+      return sourceFiles;
+    }
+  }
 };
 ScanService2 = _ts_decorate7([
   Kt(),
@@ -23706,7 +23785,7 @@ var WxmlService2 = class {
       const wxml = await import_fs_extra8.default.readFile(filepath, "utf8");
       const res = scanWxml(wxml, {
         platform: this.configService.platform,
-        ...this.configService.inlineConfig.weapp?.enhance?.wxml === true ? {} : this.configService.inlineConfig.weapp?.enhance?.wxml
+        ...this.configService.weappViteConfig?.enhance?.wxml === true ? {} : this.configService.weappViteConfig?.enhance?.wxml
       });
       this.tokenMap.set(filepath, res);
       await this.addDeps(filepath, res.deps.filter((x4) => isImportTag(x4.tagName) && isTemplate(x4.value)).map((x4) => import_pathe11.default.resolve(dirname3, x4.value)));
@@ -23882,9 +23961,7 @@ cli.command("[root]", "start dev server").alias("serve").alias("dev").option("--
   });
   await buildService.build();
   if (!options.skipNpm) {
-    await npmService.build(void 0, {
-      sourcemap: true
-    });
+    await npmService.build();
   }
   logBuildAppFinish();
   if (options.open) {

package/dist/cli.mjs

@@ -3,13 +3,13 @@ import {
   createCompilerContext,
   logger_default,
   require_Reflect
-} from "./chunk-PWDBZWAF.mjs";
-import "./chunk-4ZIYVTHH.mjs";
+} from "./chunk-6ZIOYCGJ.mjs";
+import "./chunk-RSPHXR3C.mjs";
 import {
   __name,
   __toESM,
   init_esm_shims
-} from "./chunk-ZRLZHOL5.mjs";
+} from "./chunk-PEN3BLSY.mjs";
 
 // src/cli.ts
 init_esm_shims();
@@ -756,9 +756,7 @@ cli.command("[root]", "start dev server").alias("serve").alias("dev").option("--
   });
   await buildService.build();
   if (!options.skipNpm) {
-    await npmService.build(void 0, {
-      sourcemap: true
-    });
+    await npmService.build();
   }
   logBuildAppFinish();
   if (options.open) {

package/dist/{config-DYSwq1ku.d.cts → config-Cvwqemwg.d.cts}

@@ -194,4 +194,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 Entry as E, type MpPlatform as M, type ProjectConfig as P, type ResolvedAlias as R, type SubPackageMetaValue as S, type SubPackage as a, type ScanWxmlOptions as b, defineConfig as d };
+export { type AppEntry as A, type Entry as E, type MpPlatform as M, type ProjectConfig as P, type ResolvedAlias as R, type SubPackageMetaValue as S, type WeappViteConfig as W, type SubPackage as a, type ScanWxmlOptions as b, defineConfig as d };

package/dist/{config-BM_dhf8V.d.ts → config-EPV0G671.d.ts}

@@ -194,4 +194,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 Entry as E, type MpPlatform as M, type ProjectConfig as P, type ResolvedAlias as R, type SubPackageMetaValue as S, type SubPackage as a, type ScanWxmlOptions as b, defineConfig as d };
+export { type AppEntry as A, type Entry as E, type MpPlatform as M, type ProjectConfig as P, type ResolvedAlias as R, type SubPackageMetaValue as S, type WeappViteConfig as W, type SubPackage as a, type ScanWxmlOptions as b, defineConfig as d };

package/dist/config.d.cts

@@ -1,5 +1,5 @@
 export { UserConfig, UserConfigExport, UserConfigFnObject } from 'vite';
-export { d as defineConfig } from './config-DYSwq1ku.cjs';
+export { d as defineConfig } from './config-Cvwqemwg.cjs';
 import './types-dS68tjL6.cjs';
 import 'tsup';
 import 'vite-tsconfig-paths';

package/dist/config.d.ts

@@ -1,5 +1,5 @@
 export { UserConfig, UserConfigExport, UserConfigFnObject } from 'vite';
-export { d as defineConfig } from './config-BM_dhf8V.js';
+export { d as defineConfig } from './config-EPV0G671.js';
 import './types-dS68tjL6.js';
 import 'tsup';
 import 'vite-tsconfig-paths';

package/dist/config.mjs

@@ -1,7 +1,7 @@
 import {
   defineConfig
-} from "./chunk-4ZIYVTHH.mjs";
-import "./chunk-ZRLZHOL5.mjs";
+} from "./chunk-RSPHXR3C.mjs";
+import "./chunk-PEN3BLSY.mjs";
 export {
   defineConfig
 };