weapp-vite 1.7.0 → 1.7.1

package/dist/{chunk-QRZSBRCZ.mjs → chunk-ZOFCJGXO.mjs}

@@ -3,7 +3,7 @@ import logger from "@weapp-core/logger";
 var logger_default = logger;
 
 // package.json
-var version = "1.7.0";
+var version = "1.7.1";
 
 // src/constants.ts
 var VERSION = version;
@@ -14,7 +14,7 @@ var supportedCssLangs = ["wxss", "scss", "less", "sass", "styl"];
 // src/context.ts
 import { createRequire } from "node:module";
 import process from "node:process";
-import { addExtension, defu, get as get2, isObject as isObject3, objectHash, removeExtension } from "@weapp-core/shared";
+import { addExtension as addExtension2, defu as defu2, get as get2, isObject as isObject3, objectHash, removeExtension as removeExtension2 } from "@weapp-core/shared";
 import fs5 from "fs-extra";
 import path5 from "pathe";
 import { build, loadConfigFromFile } from "vite";
@@ -43,13 +43,14 @@ function getOutputExtensions(_platform) {
 function getWeappViteConfig() {
   return {
     enhance: {
-      wxml: true
+      wxml: true,
+      wxs: true
     }
   };
 }
 
 // src/plugins/index.ts
-import { isObject as isObject2 } from "@weapp-core/shared";
+import { isObject as isObject2, removeExtension } from "@weapp-core/shared";
 import { fdir as Fdir } from "fdir";
 import fs4 from "fs-extra";
 import MagicString2 from "magic-string";
@@ -267,13 +268,135 @@ function regExpTest(arr = [], str) {
   throw new TypeError("paramater 'arr' should be a Array of Regexp | String !");
 }
 
-// src/utils/wxml.ts
+// src/wxml/index.ts
+import { addExtension, removeExtensionDeep } from "@weapp-core/shared";
 import { Parser } from "htmlparser2";
 import MagicString from "magic-string";
+
+// src/wxs/index.ts
+import babel from "@babel/core";
+import t from "@babel/types";
+import { defu } from "@weapp-core/shared";
+function transformWxsCode(code, options) {
+  const { filename } = defu(options, {
+    filename: "wxs.ts"
+  });
+  return babel.transformSync(code, {
+    presets: [
+      ["@babel/preset-env", {
+        targets: {
+          node: 0
+        }
+      }],
+      ["@babel/preset-typescript", {}]
+    ],
+    filename,
+    plugins: [
+      {
+        visitor: {
+          Directive: {
+            enter(p) {
+              p.remove();
+            }
+          },
+          ExpressionStatement(p) {
+            const expression = p.node.expression;
+            if (expression.type === "CallExpression" && expression.callee.type === "MemberExpression" && t.isIdentifier(expression.callee.object) && expression.callee.object.name === "Object" && t.isIdentifier(expression.callee.property) && expression.callee.property.name === "defineProperty" && expression.arguments.length >= 2 && t.isIdentifier(expression.arguments[0]) && expression.arguments[0].name === "exports" && t.isStringLiteral(expression.arguments[1]) && expression.arguments[1].value === "__esModule") {
+              p.remove();
+            }
+          },
+          NewExpression: {
+            enter(p) {
+              if (p.get("callee").isIdentifier({
+                name: "RegExp"
+              })) {
+                p.replaceWith(
+                  t.callExpression(t.identifier("getRegExp"), p.get("arguments").map((x) => x.node))
+                );
+              } else if (p.get("callee").isIdentifier({
+                name: "Date"
+              })) {
+                p.replaceWith(
+                  t.callExpression(t.identifier("getDate"), p.get("arguments").map((x) => x.node))
+                );
+              }
+            }
+          },
+          RegExpLiteral: {
+            enter(p) {
+              const args = [t.stringLiteral(p.node.pattern)];
+              if (p.node.flags) {
+                args.push(t.stringLiteral(p.node.flags));
+              }
+              p.replaceWith(
+                t.callExpression(t.identifier("getRegExp"), args)
+              );
+            }
+          },
+          MemberExpression: {
+            enter(p) {
+              if (p.get("object").isIdentifier({
+                name: "exports"
+              })) {
+                p.replaceWith(
+                  t.memberExpression(
+                    t.memberExpression(t.identifier("module"), t.identifier("exports")),
+                    p.get("property").node
+                  )
+                );
+              }
+            }
+          }
+        }
+      }
+    ]
+  });
+}
+
+// src/wxml/index.ts
+var srcImportTagsMap = {
+  // audio: ['src', 'poster'],
+  // video: ['src', 'poster'],
+  // image: ['src'],
+  // https://developers.weixin.qq.com/miniprogram/dev/reference/wxs/01wxs-module.html
+  wxs: ["src"]
+  // https://developers.weixin.qq.com/miniprogram/dev/reference/wxml/import.html
+  // import: ['src'],
+  // include: ['src'],
+};
 function processWxml(wxml) {
   const ms = new MagicString(wxml.toString());
+  const deps = [];
+  let currentTagName = "";
+  let importAttrs;
+  let attrs = {};
   const parser = new Parser({
-    onattribute(name, _value, _quote) {
+    onopentagname(name) {
+      currentTagName = name;
+      importAttrs = srcImportTagsMap[currentTagName];
+    },
+    onattribute(name, value, quote) {
+      attrs[name] = value;
+      if (importAttrs) {
+        for (const attrName of importAttrs) {
+          if (attrName === name) {
+            deps.push({
+              name,
+              value,
+              quote,
+              tagName: currentTagName,
+              start: parser.startIndex,
+              end: parser.endIndex,
+              attrs
+            });
+            if (currentTagName === "wxs" && name === "src") {
+              if (/\.wxs.[jt]s$/.test(value)) {
+                ms.update(parser.startIndex + 5, parser.endIndex - 1, addExtension(removeExtensionDeep(value), ".wxs"));
+              }
+            }
+          }
+        }
+      }
       if (name.startsWith("@")) {
         const start = parser.startIndex;
         const end = parser.startIndex + name.length;
@@ -301,6 +424,20 @@ function processWxml(wxml) {
           ms.update(start, end, rep);
         }
       }
+    },
+    onclosetag() {
+      currentTagName = "";
+      attrs = {};
+      importAttrs = void 0;
+    },
+    ontext(data) {
+      if (currentTagName === "wxs" && jsExtensions.includes(attrs.lang)) {
+        const res = transformWxsCode(data);
+        if (res && res.code) {
+          ms.update(parser.startIndex, parser.endIndex, `
+${res.code}`);
+        }
+      }
     }
   });
   parser.write(
@@ -308,6 +445,7 @@ function processWxml(wxml) {
   );
   parser.end();
   return {
+    deps,
     code: ms.toString()
   };
 }
@@ -426,7 +564,32 @@ function vitePluginWeapp(ctx, subPackageMeta) {
           const source = isMedia ? await fs4.readFile(filepath) : await fs4.readFile(filepath, "utf8");
           const fileName = ctx.relativeSrcRoot(file);
           if (isHtml || isWxml) {
-            const _source = weapp?.enhance?.wxml ? processWxml(source).code : source;
+            let _source;
+            if (weapp?.enhance?.wxml) {
+              const { code, deps } = processWxml(source);
+              _source = code;
+              for (const wxsDep of deps.filter((x) => x.tagName === "wxs")) {
+                if (jsExtensions.includes(wxsDep.attrs.lang) || /\.wxs\.[jt]s$/.test(wxsDep.value)) {
+                  const wxsPath = path4.resolve(path4.dirname(filepath), wxsDep.value);
+                  if (await fs4.exists(wxsPath)) {
+                    this.addWatchFile(wxsPath);
+                    const code2 = await fs4.readFile(wxsPath, "utf8");
+                    const res = transformWxsCode(code2, {
+                      filename: wxsPath
+                    });
+                    if (res && res.code) {
+                      this.emitFile({
+                        type: "asset",
+                        fileName: ctx.relativeSrcRoot(relative(removeExtension(wxsPath))),
+                        source: res.code
+                      });
+                    }
+                  }
+                }
+              }
+            } else {
+              _source = source;
+            }
             this.emitFile({
               type: "asset",
               fileName: isHtml ? changeFileExtension(fileName, ctx.outputExtensions.wxml) : fileName,
@@ -573,15 +736,6 @@ function vitePluginWeapp(ctx, subPackageMeta) {
 // src/context.ts
 var debug2 = createDebugger("weapp-vite:context");
 var require2 = createRequire(import.meta.url);
-var logBuildAppFinishOnlyShowOnce = false;
-function logBuildAppFinish() {
-  if (!logBuildAppFinishOnlyShowOnce) {
-    logger_default.success("\u5E94\u7528\u6784\u5EFA\u5B8C\u6210\uFF01\u9884\u89C8\u65B9\u5F0F ( `2` \u79CD\u9009\u5176\u4E00\u5373\u53EF)\uFF1A");
-    logger_default.info("\u6267\u884C `npm run open` / `yarn open` / `pnpm open` \u76F4\u63A5\u5728 `\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177` \u91CC\u6253\u5F00\u5F53\u524D\u5E94\u7528");
-    logger_default.info("\u6216\u624B\u52A8\u6253\u5F00\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177,\u5BFC\u5165\u6839\u76EE\u5F55(`project.config.json` \u6587\u4EF6\u6240\u5728\u7684\u76EE\u5F55),\u5373\u53EF\u9884\u89C8\u6548\u679C");
-    logBuildAppFinishOnlyShowOnce = true;
-  }
-}
 function logBuildIndependentSubPackageFinish(root) {
   logger_default.success(`\u72EC\u7ACB\u5206\u5305 ${root} \u6784\u5EFA\u5B8C\u6210\uFF01`);
 }
@@ -612,7 +766,7 @@ var CompilerContext = class {
    */
   defineEnv;
   constructor(options) {
-    const { cwd, isDev, inlineConfig, projectConfig, mode, packageJson, platform } = defu(options, {
+    const { cwd, isDev, inlineConfig, projectConfig, mode, packageJson, platform } = defu2(options, {
       cwd: process.cwd(),
       isDev: false,
       projectConfig: {},
@@ -690,7 +844,6 @@ var CompilerContext = class {
         if (e.code === "END") {
           debug2?.("dev watcher listen end");
           await this.buildSubPackage();
-          logBuildAppFinish();
           resolve(e);
         } else if (e.code === "ERROR") {
           reject(e);
@@ -702,7 +855,7 @@ var CompilerContext = class {
   }
   getConfig(subPackageMeta, ...configs) {
     if (this.isDev) {
-      return defu(
+      return defu2(
         this.inlineConfig,
         ...configs,
         {
@@ -727,7 +880,7 @@ var CompilerContext = class {
         }
       );
     } else {
-      const inlineConfig = defu(
+      const inlineConfig = defu2(
         this.inlineConfig,
         ...configs,
         {
@@ -745,20 +898,19 @@ var CompilerContext = class {
     }
   }
   async runProd() {
-    if (this.mpDistRoot) {
-      await fs5.emptyDir(this.outDir);
-      logger_default.success(`\u5DF2\u6E05\u7A7A ${this.mpDistRoot} \u76EE\u5F55`);
-    }
     debug2?.("prod build start");
     const output = await build(
       this.getConfig()
     );
     debug2?.("prod build end");
     await this.buildSubPackage();
-    logBuildAppFinish();
     return output;
   }
   async build() {
+    if (this.mpDistRoot) {
+      await fs5.emptyDir(this.outDir);
+      logger_default.success(`\u5DF2\u6E05\u7A7A ${this.mpDistRoot} \u76EE\u5F55`);
+    }
     debug2?.("build start");
     if (this.isDev) {
       await this.runDev();
@@ -789,7 +941,7 @@ var CompilerContext = class {
       command: this.isDev ? "serve" : "build",
       mode: this.mode
     }, void 0, this.cwd);
-    this.inlineConfig = defu({
+    this.inlineConfig = defu2({
       configFile: false
     }, loaded?.config, {
       build: {
@@ -800,11 +952,11 @@ var CompilerContext = class {
             entryFileNames: (chunkInfo) => {
               const name = this.relativeSrcRoot(chunkInfo.name);
               if (name.endsWith(".ts")) {
-                const baseFileName = removeExtension(name);
+                const baseFileName = removeExtension2(name);
                 if (baseFileName.endsWith(".wxs")) {
                   return baseFileName;
                 }
-                return addExtension(baseFileName, ".js");
+                return addExtension2(baseFileName, ".js");
               }
               return name;
             }
@@ -902,7 +1054,7 @@ var CompilerContext = class {
                   logger_default.success(`${dep} \u4F9D\u8D56\u672A\u53D1\u751F\u53D8\u5316\uFF0C\u8DF3\u8FC7\u5904\u7406!`);
                   continue;
                 }
-                const mergedOptions = defu(options, {
+                const mergedOptions = defu2(options, {
                   entry: {
                     index: require2.resolve(dep)
                   },
@@ -1066,7 +1218,7 @@ var CompilerContext = class {
       entries: this.entries
     };
     debug2?.("scanComponentEntry start", componentEntry);
-    const baseName = removeExtension(path5.resolve(dirname, componentEntry));
+    const baseName = removeExtension2(path5.resolve(dirname, componentEntry));
     const jsEntry = await findJsEntry(baseName);
     const partialEntry = {
       path: jsEntry