@lwc/engine-core 2.5.9 → 2.5.12

package/dist/engine-core.cjs.js

@@ -5416,7 +5416,6 @@ function updateStylesheetToken(vm, template) {
 
 function evaluateStylesheetsContent(stylesheets, stylesheetToken, vm) {
   const content = [];
-  let root;
 
   for (let i = 0; i < stylesheets.length; i++) {
     let stylesheet = stylesheets[i];
@@ -5429,46 +5428,23 @@ function evaluateStylesheetsContent(stylesheets, stylesheetToken, vm) {
         // the component instance might be attempting to use an old version of
         // the stylesheet, while internally, we have a replacement for it.
         stylesheet = getStyleOrSwappedStyle(stylesheet);
-      }
-
-      const isScopedCss = stylesheet[shared.KEY__SCOPED_CSS]; // Apply the scope token only if the stylesheet itself is scoped, or if we're rendering synthetic shadow.
-
-      const scopeToken = isScopedCss || vm.shadowMode === 1
-      /* Synthetic */
-      && vm.renderMode === 1
-      /* Shadow */
-      ? stylesheetToken : undefined; // Use the actual `:host` selector if we're rendering global CSS for light DOM, or if we're rendering
+      } // Use the actual `:host` selector if we're rendering global CSS for light DOM, or if we're rendering
       // native shadow DOM. Synthetic shadow DOM never uses `:host`.
 
+
+      const isScopedCss = stylesheet[shared.KEY__SCOPED_CSS];
       const useActualHostSelector = vm.renderMode === 0
       /* Light */
       ? !isScopedCss : vm.shadowMode === 0
       /* Native */
-      ; // Use the native :dir() pseudoclass only in native shadow DOM. Otherwise, in synthetic shadow,
-      // we use an attribute selector on the host to simulate :dir().
-
-      let useNativeDirPseudoclass;
+      ; // Apply the scope token only if the stylesheet itself is scoped, or if we're rendering synthetic shadow.
 
-      if (vm.renderMode === 1
+      const scopeToken = isScopedCss || vm.shadowMode === 1
+      /* Synthetic */
+      && vm.renderMode === 1
       /* Shadow */
-      ) {
-        useNativeDirPseudoclass = vm.shadowMode === 0
-        /* Native */
-        ;
-      } else {
-        // Light DOM components should only render `[dir]` if they're inside of a synthetic shadow root.
-        // At the top level (root is null) or inside of a native shadow root, they should use `:dir()`.
-        if (shared.isUndefined(root)) {
-          // Only calculate the root once as necessary
-          root = getNearestShadowComponent(vm);
-        }
-
-        useNativeDirPseudoclass = shared.isNull(root) || root.shadowMode === 0
-        /* Native */
-        ;
-      }
-
-      shared.ArrayPush.call(content, stylesheet(scopeToken, useActualHostSelector, useNativeDirPseudoclass));
+      ? stylesheetToken : undefined;
+      shared.ArrayPush.call(content, stylesheet(useActualHostSelector, scopeToken));
     }
   }
 
@@ -5491,12 +5467,14 @@ function getStylesheetsContent(vm, template) {
 // perf testing has not shown it to be a huge improvement yet:
 // https://github.com/salesforce/lwc/pull/2460#discussion_r691208892
 
-function getNearestShadowComponent(vm) {
+function getNearestNativeShadowComponent(vm) {
   let owner = vm;
 
   while (!shared.isNull(owner)) {
     if (owner.renderMode === 1
     /* Shadow */
+    && owner.shadowMode === 0
+    /* Native */
     ) {
       return owner;
     }
@@ -5507,20 +5485,6 @@ function getNearestShadowComponent(vm) {
   return owner;
 }
 
-function getNearestNativeShadowComponent(vm) {
-  const owner = getNearestShadowComponent(vm);
-
-  if (!shared.isNull(owner) && owner.shadowMode === 1
-  /* Synthetic */
-  ) {
-    // Synthetic-within-native is impossible. So if the nearest shadow component is
-    // synthetic, we know we won't find a native component if we go any further.
-    return null;
-  }
-
-  return owner;
-}
-
 function createStylesheet(vm, stylesheets) {
   const {
     renderer,
@@ -7246,4 +7210,4 @@ exports.swapTemplate = swapTemplate;
 exports.track = track;
 exports.unwrap = unwrap;
 exports.wire = wire;
-/* version: 2.5.9 */
+/* version: 2.5.12 */

package/dist/engine-core.js

@@ -5413,7 +5413,6 @@ function updateStylesheetToken(vm, template) {
 
 function evaluateStylesheetsContent(stylesheets, stylesheetToken, vm) {
   const content = [];
-  let root;
 
   for (let i = 0; i < stylesheets.length; i++) {
     let stylesheet = stylesheets[i];
@@ -5426,46 +5425,23 @@ function evaluateStylesheetsContent(stylesheets, stylesheetToken, vm) {
         // the component instance might be attempting to use an old version of
         // the stylesheet, while internally, we have a replacement for it.
         stylesheet = getStyleOrSwappedStyle(stylesheet);
-      }
-
-      const isScopedCss = stylesheet[KEY__SCOPED_CSS]; // Apply the scope token only if the stylesheet itself is scoped, or if we're rendering synthetic shadow.
-
-      const scopeToken = isScopedCss || vm.shadowMode === 1
-      /* Synthetic */
-      && vm.renderMode === 1
-      /* Shadow */
-      ? stylesheetToken : undefined; // Use the actual `:host` selector if we're rendering global CSS for light DOM, or if we're rendering
+      } // Use the actual `:host` selector if we're rendering global CSS for light DOM, or if we're rendering
       // native shadow DOM. Synthetic shadow DOM never uses `:host`.
 
+
+      const isScopedCss = stylesheet[KEY__SCOPED_CSS];
       const useActualHostSelector = vm.renderMode === 0
       /* Light */
       ? !isScopedCss : vm.shadowMode === 0
       /* Native */
-      ; // Use the native :dir() pseudoclass only in native shadow DOM. Otherwise, in synthetic shadow,
-      // we use an attribute selector on the host to simulate :dir().
-
-      let useNativeDirPseudoclass;
+      ; // Apply the scope token only if the stylesheet itself is scoped, or if we're rendering synthetic shadow.
 
-      if (vm.renderMode === 1
+      const scopeToken = isScopedCss || vm.shadowMode === 1
+      /* Synthetic */
+      && vm.renderMode === 1
       /* Shadow */
-      ) {
-        useNativeDirPseudoclass = vm.shadowMode === 0
-        /* Native */
-        ;
-      } else {
-        // Light DOM components should only render `[dir]` if they're inside of a synthetic shadow root.
-        // At the top level (root is null) or inside of a native shadow root, they should use `:dir()`.
-        if (isUndefined$1(root)) {
-          // Only calculate the root once as necessary
-          root = getNearestShadowComponent(vm);
-        }
-
-        useNativeDirPseudoclass = isNull(root) || root.shadowMode === 0
-        /* Native */
-        ;
-      }
-
-      ArrayPush$1.call(content, stylesheet(scopeToken, useActualHostSelector, useNativeDirPseudoclass));
+      ? stylesheetToken : undefined;
+      ArrayPush$1.call(content, stylesheet(useActualHostSelector, scopeToken));
     }
   }
 
@@ -5488,12 +5464,14 @@ function getStylesheetsContent(vm, template) {
 // perf testing has not shown it to be a huge improvement yet:
 // https://github.com/salesforce/lwc/pull/2460#discussion_r691208892
 
-function getNearestShadowComponent(vm) {
+function getNearestNativeShadowComponent(vm) {
   let owner = vm;
 
   while (!isNull(owner)) {
     if (owner.renderMode === 1
     /* Shadow */
+    && owner.shadowMode === 0
+    /* Native */
     ) {
       return owner;
     }
@@ -5504,20 +5482,6 @@ function getNearestShadowComponent(vm) {
   return owner;
 }
 
-function getNearestNativeShadowComponent(vm) {
-  const owner = getNearestShadowComponent(vm);
-
-  if (!isNull(owner) && owner.shadowMode === 1
-  /* Synthetic */
-  ) {
-    // Synthetic-within-native is impossible. So if the nearest shadow component is
-    // synthetic, we know we won't find a native component if we go any further.
-    return null;
-  }
-
-  return owner;
-}
-
 function createStylesheet(vm, stylesheets) {
   const {
     renderer,
@@ -7210,4 +7174,4 @@ function setHooks(hooks) {
 }
 
 export { LightningElement, profilerControl as __unstable__ProfilerControl, api$1 as api, connectRootElement, createContextProvider, createVM, disconnectRootElement, getAssociatedVMIfPresent, getComponentDef, getComponentInternalDef, getUpgradableConstructor, hydrateRootElement, isComponentConstructor, readonly, register, registerComponent, registerDecorators, registerTemplate, sanitizeAttribute, setHooks, swapComponent, swapStyle, swapTemplate, track, unwrap, wire };
-/* version: 2.5.9 */
+/* version: 2.5.12 */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@lwc/engine-core",
-    "version": "2.5.9",
+    "version": "2.5.12",
     "description": "Core LWC engine APIs.",
     "homepage": "https://lwc.dev/",
     "repository": {
@@ -24,8 +24,8 @@
         "types/"
     ],
     "dependencies": {
-        "@lwc/features": "2.5.9",
-        "@lwc/shared": "2.5.9"
+        "@lwc/features": "2.5.12",
+        "@lwc/shared": "2.5.12"
     },
     "devDependencies": {
         "observable-membrane": "1.1.5"
@@ -33,5 +33,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "3e50c5c599f5eb7af78bcfd6f634df10e8117145"
+    "gitHead": "e9d45e1d0cec7f2835c1b4f80142df908279abc9"
 }

package/types/framework/stylesheet.d.ts

@@ -5,7 +5,7 @@ import { Template } from './template';
  * Function producing style based on a host and a shadow selector. This function is invoked by
  * the engine with different values depending on the mode that the component is running on.
  */
-export declare type StylesheetFactory = (stylesheetToken: string | undefined, useActualHostSelector: boolean, useNativeDirPseudoclass: boolean) => string;
+export declare type StylesheetFactory = (useActualHostSelector: boolean, stylesheetToken: string | undefined) => string;
 /**
  * The list of stylesheets associated with a template. Each entry is either a StylesheetFactory or a
  * TemplateStylesheetFactory a given stylesheet depends on other external stylesheets (via the