fix(vue): setScope ignore uni-app web components

fw6 · Jun 9, 2022 · d0e4f5b · d0e4f5b
1 parent a6d2195
commit d0e4f5b
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 12 deletions.
diff --git a/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.common.dev.js b/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.common.dev.js
@@ -6139,10 +6139,13 @@ function createPatchFunction (backend) {
       }
     }
     // for slot content they should also get the scopeId from the host instance.
+    // ignore uni-app web components
     if (isDef(i = activeInstance) &&
       i !== vnode.context &&
       i !== vnode.fnContext &&
-      isDef(i = i.$options._scopeId)
+      isDef(i = i.$options._scopeId) &&
+      // TODO use other flag
+      !activeInstance._vnode.elm.__uniDataset
     ) {
       nodeOps.setStyleScope(vnode.elm, i);
     }

diff --git a/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.common.prod.js b/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.common.prod.js
diff --git a/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.esm.browser.js b/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.esm.browser.js
@@ -6171,10 +6171,13 @@ function createPatchFunction (backend) {
       }
     }
     // for slot content they should also get the scopeId from the host instance.
+    // ignore uni-app web components
     if (isDef(i = activeInstance) &&
       i !== vnode.context &&
       i !== vnode.fnContext &&
-      isDef(i = i.$options._scopeId)
+      isDef(i = i.$options._scopeId) &&
+      // TODO use other flag
+      !activeInstance._vnode.elm.__uniDataset
     ) {
       nodeOps.setStyleScope(vnode.elm, i);
     }

diff --git a/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.esm.browser.min.js b/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.esm.browser.min.js
diff --git a/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.esm.js b/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.esm.js
@@ -6159,10 +6159,13 @@ function createPatchFunction (backend) {
       }
     }
     // for slot content they should also get the scopeId from the host instance.
+    // ignore uni-app web components
     if (isDef(i = activeInstance) &&
       i !== vnode.context &&
       i !== vnode.fnContext &&
-      isDef(i = i.$options._scopeId)
+      isDef(i = i.$options._scopeId) &&
+      // TODO use other flag
+      !activeInstance._vnode.elm.__uniDataset
     ) {
       nodeOps.setStyleScope(vnode.elm, i);
     }

diff --git a/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.js b/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.js
@@ -6143,10 +6143,13 @@
         }
       }
       // for slot content they should also get the scopeId from the host instance.
+      // ignore uni-app web components
       if (isDef(i = activeInstance) &&
         i !== vnode.context &&
         i !== vnode.fnContext &&
-        isDef(i = i.$options._scopeId)
+        isDef(i = i.$options._scopeId) &&
+        // TODO use other flag
+        !activeInstance._vnode.elm.__uniDataset
       ) {
         nodeOps.setStyleScope(vnode.elm, i);
       }

diff --git a/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.min.js b/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.min.js
diff --git a/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.runtime.common.dev.js b/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.runtime.common.dev.js
@@ -6128,10 +6128,13 @@ function createPatchFunction (backend) {
       }
     }
     // for slot content they should also get the scopeId from the host instance.
+    // ignore uni-app web components
     if (isDef(i = activeInstance) &&
       i !== vnode.context &&
       i !== vnode.fnContext &&
-      isDef(i = i.$options._scopeId)
+      isDef(i = i.$options._scopeId) &&
+      // TODO use other flag
+      !activeInstance._vnode.elm.__uniDataset
     ) {
       nodeOps.setStyleScope(vnode.elm, i);
     }

diff --git a/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.runtime.common.prod.js b/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.runtime.common.prod.js
diff --git a/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.runtime.esm.js b/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.runtime.esm.js
@@ -6148,10 +6148,13 @@ function createPatchFunction (backend) {
       }
     }
     // for slot content they should also get the scopeId from the host instance.
+    // ignore uni-app web components
     if (isDef(i = activeInstance) &&
       i !== vnode.context &&
       i !== vnode.fnContext &&
-      isDef(i = i.$options._scopeId)
+      isDef(i = i.$options._scopeId) &&
+      // TODO use other flag
+      !activeInstance._vnode.elm.__uniDataset
     ) {
       nodeOps.setStyleScope(vnode.elm, i);
     }

diff --git a/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.runtime.js b/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.runtime.js
@@ -6132,10 +6132,13 @@
         }
       }
       // for slot content they should also get the scopeId from the host instance.
+      // ignore uni-app web components
       if (isDef(i = activeInstance) &&
         i !== vnode.context &&
         i !== vnode.fnContext &&
-        isDef(i = i.$options._scopeId)
+        isDef(i = i.$options._scopeId) &&
+        // TODO use other flag
+        !activeInstance._vnode.elm.__uniDataset
       ) {
         nodeOps.setStyleScope(vnode.elm, i);
       }

diff --git a/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.runtime.min.js b/packages/vue-cli-plugin-uni/packages/h5-vue/dist/vue.runtime.min.js