fix(weapp/alipay):修复root-portal不支持嵌套的问题，fix NervJS#12878

* fix: 修复canvasContext的createLinearGradient循环调用的问题 * fix(weapp):修复root-portal不支持嵌套的问题 * fix(template): 将 root-portal 的处理放到端平台插件里 --------- Co-authored-by: 三少 <sanshao@dian.so> Co-authored-by: chenjiajian <798095202@qq.com>
TheKonka · Mar 18, 2024 · 2413691 · 2413691
1 parent e2a58bb
commit 2413691
Show file tree

Hide file tree

Showing 36 changed files with 2,542 additions and 2,531 deletions.
diff --git a/packages/shared/src/components.ts b/packages/shared/src/components.ts
@@ -537,5 +537,5 @@ export const nestElements = new Map([
   ['form', 4],
   ['scroll-view', 4],
   ['swiper', 4],
-  ['swiper-item', 4]
+  ['swiper-item', 4],
 ])
diff --git a/packages/taro-alipay/src/template.ts b/packages/taro-alipay/src/template.ts
@@ -19,6 +19,11 @@ export class Template extends RecursiveTemplate {
 
   transferComponents: Record<string, Record<string, string>> = {}
 
+  constructor () {
+    super()
+    this.nestElements.set('root-portal', 3)
+  }
+
   buildXsTemplate (filePath = './utils') {
     return `<import-sjs name="xs" from="${filePath}.sjs" />`
   }

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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
diff --git a/packages/taro-mini-runner/src/__tests__/qq.spec.ts b/packages/taro-mini-runner/src/__tests__/qq.spec.ts
@@ -4,6 +4,9 @@ import { QQ } from '@tarojs/plugin-platform-qq'
 import { compile, getOutput } from './utils/compiler'
 
 const program = new QQ({ helper } as any, {})
+program.modifyTemplate({})
+program.beforeBuild()
+
 const customConfig = {
   buildAdapter: 'qq',
   globalObject: program.globalObject,

diff --git a/packages/taro-mini-runner/src/__tests__/utils/compiler.ts b/packages/taro-mini-runner/src/__tests__/utils/compiler.ts
@@ -96,6 +96,7 @@ export async function compile (app: string, customConfig: Partial<IBuildConfig>
 
   if (!customConfig.buildAdapter) {
     const program = new Weapp({ helper } as any, {})
+    program.modifyTemplate?.({})
     customConfig.globalObject = program.globalObject
     customConfig.fileType = program.fileType
     customConfig.template = program.template

diff --git a/packages/taro-weapp/src/template.ts b/packages/taro-weapp/src/template.ts
@@ -22,6 +22,7 @@ export class Template extends UnRecursiveTemplate {
   constructor (pluginOptions?: IOptions) {
     super()
     this.pluginOptions = pluginOptions || {}
+    this.nestElements.set('root-portal', 3)
   }
 
   buildXsTemplate (filePath = './utils') {

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
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
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
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
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
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
@@ -4565,8 +4565,8 @@ require("./runtime");
 /** filePath: dist/utils.jds **/
 module.exports = {
   a: function (l, n, s) {
-    var a = ["7","0","18","5","2","11","6","4","39","40","22","19","37","41","42"]
-    var b = ["4","39","40","22","19","37","41","42"]
+    var a = ["7","0","18","5","2","11","6","4","39","40","22","19","37","41","42","root-portal"]
+    var b = ["4","39","40","22","19","37","41","42","root-portal"]
     if (a.indexOf(n) === -1) {
       l = 0
     }
@@ -4594,7 +4594,7 @@ module.exports = {
     return 'tmpl_' + n + '_container'
   },
   f: function (l, n) {
-    var b = ["4","39","40","22","19","37","41","42"]
+    var b = ["4","39","40","22","19","37","41","42","root-portal"]
     if (b.indexOf(n) > -1) {
       if (l) l += ','
       l += n

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
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
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
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
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
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
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
diff --git a/packages/taro-webpack5-runner/src/__tests__/utils/compiler.ts b/packages/taro-webpack5-runner/src/__tests__/utils/compiler.ts
@@ -78,6 +78,7 @@ export async function compile<T extends MiniBuildConfig | H5BuildConfig = Common
 
   if (isMiniConfig(customConfig) && customConfig.buildAdapter === 'weapp') {
     const program = new Weapp({ helper } as any, {})
+    program.modifyTemplate?.({})
     customConfig.globalObject = program.globalObject
     customConfig.fileType = program.fileType
     customConfig.template = program.template