fix: review comments

Author: jhefferman-sfdc

packages/@lwc/integration-karma/helpers/test-hydrate.js

@@ -33,7 +33,7 @@ window.HydrateTest = (function (lwc, testUtils) {
     }
 
     function runTest(ssrRendered, Component, testConfig) {
-        window.LwcSsrClientUtils.clearStylesheetCache();
+        window.__lwcClearStylesheetCache();
         const container = appendTestTarget(ssrRendered);
         const selector = container.firstChild.tagName.toLowerCase();
         let target = container.querySelector(selector);

packages/@lwc/integration-karma/test-hydration/light-dom/scoped-styles/deduped-scoped-styles/index.spec.js

@@ -1,6 +1,6 @@
 export default {
     test(target, snapshot, consoleCalls) {
-        // Expect no errors or warnings, hydration or otherwise
+        // W-19087941: Expect no errors or warnings, hydration or otherwise
         TestUtils.expectConsoleCalls(consoleCalls, {
             error: [],
             warn: [],

packages/@lwc/ssr-client-utils/src/index.ts

@@ -61,9 +61,7 @@ export function registerLwcStyleComponent() {
     customElements.define('lwc-style', StyleDeduplicator);
 }
 
-/**
- * Clears the stylesheet cache. This is useful for testing purposes.
- */
-export function clearStylesheetCache() {
-    stylesheetCache.clear();
+// Only used in LWC's Karma tests
+if (process.env.NODE_ENV === 'test-karma-lwc') {
+    (window as any).__lwcClearStylesheetCache = () => stylesheetCache.clear();
 }

packages/@lwc/ssr-runtime/src/styles.ts

@@ -71,10 +71,11 @@ export function renderStylesheets(
         if (!styleDedupeIsEnabled) {
             const styleContents = stylesheet(token, useActualHostSelector, useNativeDirPseudoclass);
             validateStyleTextContents(styleContents);
+            // TODO [#2869]: `<style>`s should not have scope token classes
             result += `<style${hasAnyScopedStyles ? ` class="${scopeToken}"` : ''} type="text/css">${styleContents}</style>`;
         } else if (stylesheetToId.has(stylesheet)) {
             const styleId = stylesheetToId.get(stylesheet);
-            // TODO [#2869]: `<style>`s should not have scope token classes, but required for hydration to function correctly (W-19087941).
+            // TODO [#2869]: `<lwc-style>`s should not have scope token classes, but required for hydration to function correctly (W-19087941).
             result += `<lwc-style${hasAnyScopedStyles ? ` class="${scopeToken}"` : ''} style-id="lwc-style-${styleDedupePrefix}-${styleId}"></lwc-style>`;
         } else {
             const styleId = emit.cxt.nextId++;