From d4a06b81c1b23865ce15aa71c407fcf6e8a3f3f7 Mon Sep 17 00:00:00 2001
From: xuanzebin <xuanzebin3@jd.com>
Date: Mon, 16 Oct 2023 13:42:19 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(template):=20=E4=BF=AE=E5=A4=8D=20comp?=
 =?UTF-8?q?=20=E5=92=8C=20custom-wrapper=20=E6=B2=A1=E6=9C=89=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E5=BC=95=E7=94=A8=20wxs=20=E6=96=87=E4=BB=B6=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84=20wxs=20=E5=87=BD=E6=95=B0=E5=A4=B1=E6=95=88?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/shared/src/template.ts                   |  6 +++++-
 .../__tests__/__snapshots__/babel.spec.ts.snap    |  3 ++-
 .../__snapshots__/common-style.spec.ts.snap       |  3 ++-
 .../__snapshots__/compiler-macros.spec.ts.snap    |  3 ++-
 .../__tests__/__snapshots__/config.spec.ts.snap   |  9 ++++++---
 .../__snapshots__/css-modules.spec.ts.snap        |  6 ++++--
 .../__snapshots__/custom-tabbar.spec.ts.snap      |  3 ++-
 .../src/__tests__/__snapshots__/jd.spec.ts.snap   |  3 ++-
 .../__snapshots__/parse-html.spec.ts.snap         |  3 ++-
 .../__snapshots__/prerender.spec.ts.snap          |  9 ++++++---
 .../src/__tests__/__snapshots__/qq.spec.ts.snap   |  6 ++++--
 .../__tests__/__snapshots__/react.spec.ts.snap    |  3 ++-
 .../src/__tests__/__snapshots__/sass.spec.ts.snap | 12 ++++++++----
 .../__snapshots__/subpackages.spec.ts.snap        |  3 ++-
 .../__tests__/__snapshots__/tabbar.spec.ts.snap   |  3 ++-
 .../src/__tests__/__snapshots__/ts.spec.ts.snap   |  3 ++-
 .../src/__tests__/__snapshots__/vue.spec.ts.snap  |  3 ++-
 .../src/__tests__/__snapshots__/vue3.spec.ts.snap |  3 ++-
 .../__snapshots__/wx-hybrid.spec.ts.snap          |  3 ++-
 .../__tests__/__snapshots__/babel.spec.ts.snap    |  3 ++-
 .../__snapshots__/compiler-macros.spec.ts.snap    |  3 ++-
 .../__tests__/__snapshots__/config.spec.ts.snap   | 12 ++++++++----
 .../__snapshots__/css-modules.spec.ts.snap        |  6 ++++--
 .../__snapshots__/framework.spec.ts.snap          | 12 ++++++++----
 .../__snapshots__/mini-platform.spec.ts.snap      |  3 ++-
 .../__snapshots__/parse-html.spec.ts.snap         |  3 ++-
 .../__snapshots__/prerender.spec.ts.snap          |  9 ++++++---
 .../src/__tests__/__snapshots__/sass.spec.ts.snap | 15 ++++++++++-----
 .../__snapshots__/subpackages.spec.ts.snap        |  3 ++-
 .../__tests__/__snapshots__/tabbar.spec.ts.snap   |  6 ++++--
 .../src/__tests__/__snapshots__/ts.spec.ts.snap   |  3 ++-
 .../__snapshots__/wx-hybrid.spec.ts.snap          |  3 ++-
 pnpm-lock.yaml                                    |  3 ---
 33 files changed, 113 insertions(+), 58 deletions(-)

diff --git a/packages/shared/src/template.ts b/packages/shared/src/template.ts
index 8a9331ef23ae..0914aac3ec6b 100644
--- a/packages/shared/src/template.ts
+++ b/packages/shared/src/template.ts
@@ -501,12 +501,14 @@ export class BaseTemplate {
 
   public buildBaseComponentTemplate = (ext: string) => {
     const data = !this.isSupportRecursive && this.supportXS
-      ? this.dataKeymap('i:i,c:1,l:l')
+      ? this.dataKeymap(`i:i,c:1,l:xs.f('',i.${Shortcuts.NodeName})`)
       : this.isSupportRecursive
         ? this.dataKeymap('i:i')
         : this.dataKeymap('i:i,c:1')
 
+    // 此处需要重新引入 xs 函数，否则会出现 ws.f() 在 comp.wxml 和 custom-wrapper.wxml 中永远返回 undefined 的问题 #14599
     return `<import src="./base${ext}" />
+    ${this.buildXsTemplate()}
 <template is="{{'tmpl_0_' + i.nn}}" data="{{${data}}}" />`
   }
 
@@ -518,7 +520,9 @@ export class BaseTemplate {
         ? this.dataKeymap('i:item')
         : this.dataKeymap('i:item,c:1')
 
+    // 此处需要重新引入 xs 函数，否则会出现 ws.f() 在 comp.wxml 和 custom-wrapper.wxml 中永远返回 undefined 的问题 #14599
     return `<import src="./base${ext}" />
+  ${this.buildXsTemplate()}
   <block ${Adapter.for}="{{i.${Shortcuts.Childnodes}}}" ${Adapter.key}="sid">
     <template is="{{'tmpl_0_' + item.nn}}" data="{{${data}}}" />
   </block>`
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/babel.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/babel.spec.ts.snap
index e6eb7306bfdd..b23b280a7675 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/babel.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/babel.spec.ts.snap
@@ -1305,7 +1305,8 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/common-style.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/common-style.spec.ts.snap
index 348d6bbb9de3..e7c2c289c754 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/common-style.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/common-style.spec.ts.snap
@@ -1347,7 +1347,8 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/about/index.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap
index 50c14130edcf..a28a499fef95 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap
@@ -1305,7 +1305,8 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/config.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/config.spec.ts.snap
index 5ff65e9af3a4..5cd43066e682 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/config.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/config.spec.ts.snap
@@ -1465,7 +1465,8 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
@@ -3039,7 +3040,8 @@ require("./taro");
 
 /** filePath: output/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: output/pages/index/index.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
@@ -4727,7 +4729,8 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/irrelevant.txt **/
 I m irrelevant.
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap
index 06c619d7f2c0..920b93a169ed 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap
@@ -1307,7 +1307,8 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
@@ -2899,7 +2900,8 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/custom-tabbar.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/custom-tabbar.spec.ts.snap
index f5f419ca87d4..4b05217ea651 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/custom-tabbar.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/custom-tabbar.spec.ts.snap
@@ -1500,7 +1500,8 @@ h�hځ��r������Nb2��х��K~��>;;ːL�1
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/custom-tab-bar/index.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 7 ], {
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/jd.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/jd.spec.ts.snap
index bb64bfade0d5..661f00d621c9 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/jd.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/jd.spec.ts.snap
@@ -1125,7 +1125,8 @@ require("./taro");
 
 /** filePath: dist/comp.jxml **/
 <import src="./base.jxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <jds src="./utils.jds" module="xs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 /*! For license information please see index.js.LICENSE.txt */
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap
index 917f7f3667c5..c12bd30cd6da 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap
@@ -1305,7 +1305,8 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap
index a673177fab56..fbae255596bd 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap
@@ -1319,7 +1319,8 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/others/detail/index.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
@@ -4285,7 +4286,8 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/others/detail/index.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
@@ -7251,7 +7253,8 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/others/detail/index.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/qq.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/qq.spec.ts.snap
index 4abb60983b94..5e2d128b87fd 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/qq.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/qq.spec.ts.snap
@@ -1601,7 +1601,8 @@ require("./taro");
 
 /** filePath: dist/comp.qml **/
 <import src="./base.qml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 /*! For license information please see index.js.LICENSE.txt */
@@ -3838,7 +3839,8 @@ require("./taro");
 
 /** filePath: dist/comp.qml **/
 <import src="./base.qml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 /*! For license information please see index.js.LICENSE.txt */
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/react.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/react.spec.ts.snap
index 8544d694bdf2..b47833d3a136 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/react.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/react.spec.ts.snap
@@ -1537,7 +1537,8 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 /*! For license information please see index.js.LICENSE.txt */
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/sass.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/sass.spec.ts.snap
index c8a1e3bd92be..ddc8e26864ff 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/sass.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/sass.spec.ts.snap
@@ -1305,7 +1305,8 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
@@ -2880,7 +2881,8 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
@@ -4455,7 +4457,8 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
@@ -6030,7 +6033,8 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap
index 674473ba4dcc..967e9ca80d54 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap
@@ -1324,7 +1324,8 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/packageA/detail/index.js **/
 require("../../sub-utils");
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap
index 12cac6e43a3b..43d220696016 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap
@@ -2636,7 +2636,8 @@ h�hځ��r������Nb2��х��K~��>;;ːL�1
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/about/index.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/ts.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/ts.spec.ts.snap
index 269cc409e34a..c2a806fd4fab 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/ts.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/ts.spec.ts.snap
@@ -1305,7 +1305,8 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 8 ], {
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/vue.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/vue.spec.ts.snap
index 0d6b40e980d2..285e32bf0566 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/vue.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/vue.spec.ts.snap
@@ -1271,7 +1271,8 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 6 ], {
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/vue3.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/vue3.spec.ts.snap
index 7146cfca741f..9fd9dc3730fb 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/vue3.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/vue3.spec.ts.snap
@@ -1276,7 +1276,8 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 7 ], {
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap
index 01a5a7eea862..064273287fb2 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap
@@ -1449,7 +1449,8 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/components/tab/tab.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 7 ], {
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/babel.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/babel.spec.ts.snap
index 60d895b8e38f..54e23ecd4207 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/babel.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/babel.spec.ts.snap
@@ -1369,7 +1369,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 "use strict";
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap
index 48245db50bff..b03ec90710e5 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap
@@ -1369,7 +1369,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 "use strict";
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/config.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/config.spec.ts.snap
index 13808ebe16c3..fc29745f9eca 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/config.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/config.spec.ts.snap
@@ -1529,7 +1529,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 "use strict";
@@ -3181,7 +3182,8 @@ require("./runtime");
 
 /** filePath: output/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: output/pages/index/index.js **/
 "use strict";
@@ -5104,7 +5106,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/irrelevant.txt **/
 I m irrelevant.
@@ -6928,7 +6931,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 "use strict";
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap
index aa310bf46c75..aa104c541ed2 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap
@@ -1370,7 +1370,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 "use strict";
@@ -3189,7 +3190,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 "use strict";
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/framework.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/framework.spec.ts.snap
index 041b8a902a00..8bca244310de 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/framework.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/framework.spec.ts.snap
@@ -1596,7 +1596,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 "use strict";
@@ -3637,7 +3638,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 /*! For license information please see index.js.LICENSE.txt */
@@ -6008,7 +6010,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 "use strict";
@@ -7759,7 +7762,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 "use strict";
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/mini-platform.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/mini-platform.spec.ts.snap
index a635e2fc2f17..df200e8cf57c 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/mini-platform.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/mini-platform.spec.ts.snap
@@ -4023,7 +4023,8 @@ require("./runtime");
 
 /** filePath: dist/comp.jxml **/
 <import src="./base.jxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <jds src="./utils.jds" module="xs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 /*! For license information please see index.js.LICENSE.txt */
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap
index 303e9c8d760e..bd2aeb9ea2d0 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap
@@ -1366,7 +1366,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 "use strict";
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap
index b01d897ef8da..0134faa8b220 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap
@@ -1405,7 +1405,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/others/detail/index.js **/
 "use strict";
@@ -4482,7 +4483,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/others/detail/index.js **/
 "use strict";
@@ -7559,7 +7561,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/others/detail/index.js **/
 "use strict";
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/sass.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/sass.spec.ts.snap
index bd8883619d30..f114013319ea 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/sass.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/sass.spec.ts.snap
@@ -1357,7 +1357,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 "use strict";
@@ -3142,7 +3143,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 "use strict";
@@ -4951,7 +4953,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 "use strict";
@@ -6760,7 +6763,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 "use strict";
@@ -8569,7 +8573,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 "use strict";
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap
index de44b5470819..881e8263c792 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap
@@ -1406,7 +1406,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/packageA/detail/index.js **/
 "use strict";require("../sub-vendors.js");
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap
index 79e860772f02..01265e3ae537 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap
@@ -1585,7 +1585,8 @@ h�hځ��r������Nb2��х��K~��>;;ːL�1
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/custom-tab-bar/index.js **/
 "use strict";
@@ -4752,7 +4753,8 @@ h�hځ��r������Nb2��х��K~��>;;ːL�1
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/about/index.js **/
 "use strict";
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/ts.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/ts.spec.ts.snap
index c9ac4b742b8a..619ff9a684a5 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/ts.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/ts.spec.ts.snap
@@ -1369,7 +1369,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
 "use strict";
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap
index 1c4cad07d8b9..fdb2cb988dc8 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap
@@ -1506,7 +1506,8 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:l}}" />
+    <wxs module="xs" src="./utils.wxs" />
+<template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/components/tab/tab.js **/
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([ [ 9 ], {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1360d7d818b3..efd3b7c5865d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -936,9 +936,6 @@ importers:
       react-native-svg: registry.npmjs.org/react-native-svg/13.7.0_hitw53fjdtts735uumzgadsnzq
       react-test-renderer: registry.npmjs.org/react-test-renderer/18.1.0_react@18.1.0
 
-  packages/taro-components/loader:
-    specifiers: {}
-
   packages/taro-extend:
     specifiers:
       jest: ^29.3.1

From 927efa22d521fa3de62ef6b2fc825408a734a7b9 Mon Sep 17 00:00:00 2001
From: xuanzebin <xuanzebin3@jd.com>
Date: Mon, 16 Oct 2023 13:53:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?style(template):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/shared/src/template.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/shared/src/template.ts b/packages/shared/src/template.ts
index 0914aac3ec6b..30975bb57f9b 100644
--- a/packages/shared/src/template.ts
+++ b/packages/shared/src/template.ts
@@ -508,7 +508,7 @@ export class BaseTemplate {
 
     // 此处需要重新引入 xs 函数，否则会出现 ws.f() 在 comp.wxml 和 custom-wrapper.wxml 中永远返回 undefined 的问题 #14599
     return `<import src="./base${ext}" />
-    ${this.buildXsTemplate()}
+${this.buildXsTemplate()}
 <template is="{{'tmpl_0_' + i.nn}}" data="{{${data}}}" />`
   }
 

From 61c357afb99250db28ff5987878e13a43fe79f0c Mon Sep 17 00:00:00 2001
From: xuanzebin <xuanzebin3@jd.com>
Date: Mon, 16 Oct 2023 14:02:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?test(snapshot):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=BF=AB=E7=85=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/__tests__/__snapshots__/babel.spec.ts.snap     |  2 +-
 .../__tests__/__snapshots__/common-style.spec.ts.snap  |  2 +-
 .../__snapshots__/compiler-macros.spec.ts.snap         |  2 +-
 .../src/__tests__/__snapshots__/config.spec.ts.snap    |  6 +++---
 .../__tests__/__snapshots__/css-modules.spec.ts.snap   |  4 ++--
 .../__tests__/__snapshots__/custom-tabbar.spec.ts.snap |  2 +-
 .../src/__tests__/__snapshots__/jd.spec.ts.snap        |  2 +-
 .../__tests__/__snapshots__/parse-html.spec.ts.snap    |  2 +-
 .../src/__tests__/__snapshots__/prerender.spec.ts.snap |  6 +++---
 .../src/__tests__/__snapshots__/qq.spec.ts.snap        |  4 ++--
 .../src/__tests__/__snapshots__/react.spec.ts.snap     |  2 +-
 .../src/__tests__/__snapshots__/sass.spec.ts.snap      |  8 ++++----
 .../__tests__/__snapshots__/subpackages.spec.ts.snap   |  2 +-
 .../src/__tests__/__snapshots__/tabbar.spec.ts.snap    |  2 +-
 .../src/__tests__/__snapshots__/ts.spec.ts.snap        |  2 +-
 .../src/__tests__/__snapshots__/vue.spec.ts.snap       |  2 +-
 .../src/__tests__/__snapshots__/vue3.spec.ts.snap      |  2 +-
 .../src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap |  2 +-
 .../src/__tests__/__snapshots__/babel.spec.ts.snap     |  2 +-
 .../__snapshots__/compiler-macros.spec.ts.snap         |  2 +-
 .../src/__tests__/__snapshots__/config.spec.ts.snap    |  8 ++++----
 .../__tests__/__snapshots__/css-modules.spec.ts.snap   |  4 ++--
 .../src/__tests__/__snapshots__/framework.spec.ts.snap |  8 ++++----
 .../__tests__/__snapshots__/mini-platform.spec.ts.snap |  2 +-
 .../__tests__/__snapshots__/parse-html.spec.ts.snap    |  2 +-
 .../src/__tests__/__snapshots__/prerender.spec.ts.snap |  6 +++---
 .../src/__tests__/__snapshots__/sass.spec.ts.snap      | 10 +++++-----
 .../__tests__/__snapshots__/subpackages.spec.ts.snap   |  2 +-
 .../src/__tests__/__snapshots__/tabbar.spec.ts.snap    |  4 ++--
 .../src/__tests__/__snapshots__/ts.spec.ts.snap        |  2 +-
 .../src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap |  2 +-
 31 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/babel.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/babel.spec.ts.snap
index b23b280a7675..d9b2ecc84a44 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/babel.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/babel.spec.ts.snap
@@ -1305,7 +1305,7 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/common-style.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/common-style.spec.ts.snap
index e7c2c289c754..078498fec92c 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/common-style.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/common-style.spec.ts.snap
@@ -1347,7 +1347,7 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/about/index.js **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap
index a28a499fef95..3b2d550717dc 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap
@@ -1305,7 +1305,7 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/config.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/config.spec.ts.snap
index 5cd43066e682..125e7ba956de 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/config.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/config.spec.ts.snap
@@ -1465,7 +1465,7 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
@@ -3040,7 +3040,7 @@ require("./taro");
 
 /** filePath: output/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: output/pages/index/index.js **/
@@ -4729,7 +4729,7 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/irrelevant.txt **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap
index 920b93a169ed..47033e71d282 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap
@@ -1307,7 +1307,7 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
@@ -2900,7 +2900,7 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/custom-tabbar.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/custom-tabbar.spec.ts.snap
index 4b05217ea651..5b37b709fcdd 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/custom-tabbar.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/custom-tabbar.spec.ts.snap
@@ -1500,7 +1500,7 @@ h�hځ��r������Nb2��х��K~��>;;ːL�1
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/custom-tab-bar/index.js **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/jd.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/jd.spec.ts.snap
index 661f00d621c9..b67f650fcd71 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/jd.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/jd.spec.ts.snap
@@ -1125,7 +1125,7 @@ require("./taro");
 
 /** filePath: dist/comp.jxml **/
 <import src="./base.jxml" />
-    <jds src="./utils.jds" module="xs" />
+<jds src="./utils.jds" module="xs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap
index c12bd30cd6da..a3ea7842ec61 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap
@@ -1305,7 +1305,7 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap
index fbae255596bd..c9d2ce129e7b 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap
@@ -1319,7 +1319,7 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/others/detail/index.js **/
@@ -4286,7 +4286,7 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/others/detail/index.js **/
@@ -7253,7 +7253,7 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/others/detail/index.js **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/qq.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/qq.spec.ts.snap
index 5e2d128b87fd..08dd278c0307 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/qq.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/qq.spec.ts.snap
@@ -1601,7 +1601,7 @@ require("./taro");
 
 /** filePath: dist/comp.qml **/
 <import src="./base.qml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
@@ -3839,7 +3839,7 @@ require("./taro");
 
 /** filePath: dist/comp.qml **/
 <import src="./base.qml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/react.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/react.spec.ts.snap
index b47833d3a136..7314b3bacd52 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/react.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/react.spec.ts.snap
@@ -1537,7 +1537,7 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/sass.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/sass.spec.ts.snap
index ddc8e26864ff..f50bceccfd85 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/sass.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/sass.spec.ts.snap
@@ -1305,7 +1305,7 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
@@ -2881,7 +2881,7 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
@@ -4457,7 +4457,7 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
@@ -6033,7 +6033,7 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap
index 967e9ca80d54..c2589ec29c5e 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap
@@ -1324,7 +1324,7 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/packageA/detail/index.js **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap
index 43d220696016..6e226b2a529e 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap
@@ -2636,7 +2636,7 @@ h�hځ��r������Nb2��х��K~��>;;ːL�1
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/about/index.js **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/ts.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/ts.spec.ts.snap
index c2a806fd4fab..6ef2513cd251 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/ts.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/ts.spec.ts.snap
@@ -1305,7 +1305,7 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/vue.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/vue.spec.ts.snap
index 285e32bf0566..24b85fc8ab7a 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/vue.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/vue.spec.ts.snap
@@ -1271,7 +1271,7 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/vue3.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/vue3.spec.ts.snap
index 9fd9dc3730fb..96113d7bafac 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/vue3.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/vue3.spec.ts.snap
@@ -1276,7 +1276,7 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap
index 064273287fb2..e72378c03b45 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap
@@ -1449,7 +1449,7 @@ require("./taro");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/components/tab/tab.js **/
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/babel.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/babel.spec.ts.snap
index 54e23ecd4207..e63a39a18789 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/babel.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/babel.spec.ts.snap
@@ -1369,7 +1369,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap
index b03ec90710e5..de56e4bbbde9 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap
@@ -1369,7 +1369,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/config.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/config.spec.ts.snap
index fc29745f9eca..fcd357bd7723 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/config.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/config.spec.ts.snap
@@ -1529,7 +1529,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
@@ -3182,7 +3182,7 @@ require("./runtime");
 
 /** filePath: output/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: output/pages/index/index.js **/
@@ -5106,7 +5106,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/irrelevant.txt **/
@@ -6931,7 +6931,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap
index aa104c541ed2..7dd8c19747df 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap
@@ -1370,7 +1370,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
@@ -3190,7 +3190,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/framework.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/framework.spec.ts.snap
index 8bca244310de..db7ef5a94453 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/framework.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/framework.spec.ts.snap
@@ -1596,7 +1596,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
@@ -3638,7 +3638,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
@@ -6010,7 +6010,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
@@ -7762,7 +7762,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/mini-platform.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/mini-platform.spec.ts.snap
index df200e8cf57c..4c35ff630202 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/mini-platform.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/mini-platform.spec.ts.snap
@@ -4023,7 +4023,7 @@ require("./runtime");
 
 /** filePath: dist/comp.jxml **/
 <import src="./base.jxml" />
-    <jds src="./utils.jds" module="xs" />
+<jds src="./utils.jds" module="xs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap
index bd2aeb9ea2d0..c0c7697441e4 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap
@@ -1366,7 +1366,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap
index 0134faa8b220..cdc5c59ffa51 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap
@@ -1405,7 +1405,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/others/detail/index.js **/
@@ -4483,7 +4483,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/others/detail/index.js **/
@@ -7561,7 +7561,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/others/detail/index.js **/
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/sass.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/sass.spec.ts.snap
index f114013319ea..b6f7ed93540e 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/sass.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/sass.spec.ts.snap
@@ -1357,7 +1357,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
@@ -3143,7 +3143,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
@@ -4953,7 +4953,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
@@ -6763,7 +6763,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
@@ -8573,7 +8573,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap
index 881e8263c792..4f8be9b3af75 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap
@@ -1406,7 +1406,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/packageA/detail/index.js **/
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap
index 01265e3ae537..91ea57c50cca 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap
@@ -1585,7 +1585,7 @@ h�hځ��r������Nb2��х��K~��>;;ːL�1
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/custom-tab-bar/index.js **/
@@ -4753,7 +4753,7 @@ h�hځ��r������Nb2��х��K~��>;;ːL�1
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/about/index.js **/
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/ts.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/ts.spec.ts.snap
index 619ff9a684a5..ae96ae89af1b 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/ts.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/ts.spec.ts.snap
@@ -1369,7 +1369,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/pages/index/index.js **/
diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap
index fdb2cb988dc8..5e46a089c6e3 100644
--- a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap
+++ b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap
@@ -1506,7 +1506,7 @@ require("./runtime");
 
 /** filePath: dist/comp.wxml **/
 <import src="./base.wxml" />
-    <wxs module="xs" src="./utils.wxs" />
+<wxs module="xs" src="./utils.wxs" />
 <template is="{{'tmpl_0_' + i.nn}}" data="{{i:i,c:1,l:xs.f('',i.nn)}}" />
 
 /** filePath: dist/components/tab/tab.js **/