@salesforcedevs/dx-components 1.31.8 → 1.31.9-alpha3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dx-components",
-    "version": "1.31.8",
+    "version": "1.31.9-alpha3",
     "description": "DX Lightning web components",
     "license": "MIT",
     "engines": {
@@ -43,6 +43,5 @@
         "eventsourcemock": "2.0.0",
         "luxon": "3.4.4",
         "msw": "^2.12.4"
-    },
-    "gitHead": "3433c3870460a19b28ec23cbd97db1ddfe38ee05"
+    }
 }

package/src/modules/dx/codeBlock/codeBlock.css

@@ -143,6 +143,13 @@ code[class*="shiki"] {
     padding: 0 var(--dx-g-spacing-md) 0 var(--dx-g-spacing-sm);
     text-align: right;
     user-select: none;
+}
+
+.dx-theme-light .code-line-number {
+    color: var(--dx-g-gray-40);
+}
+
+.dx-theme-dark .code-line-number {
     color: var(--dx-g-gray-60);
 }
 

package/src/modules/dxUtils/shikiCore/shikiCore.ts

@@ -89,26 +89,51 @@ export const OPTIONAL_LANGUAGES: Record<string, any> = {
     agentscript: getCustomLanguageGrammars().agentscript
 };
 
+const languageLoadPromises = new WeakMap<
+    HighlighterCore,
+    Map<string, Promise<void>>
+>();
+
 export async function loadLanguageIfNeeded(
     highlighter: HighlighterCore,
     language: string
 ): Promise<void> {
-    const loadedLanguages = highlighter.getLoadedLanguages();
+    // Fast path: already loaded
+    if (highlighter.getLoadedLanguages().includes(language as BundledLanguage)) {
+        return;
+    }
 
-    if (!loadedLanguages.includes(language as BundledLanguage)) {
-        const languageLoader = OPTIONAL_LANGUAGES[language];
-
-        if (languageLoader) {
-            try {
-                await highlighter.loadLanguage(languageLoader);
-            } catch (error) {
-                console.warn(
-                    `Failed to load optional language ${language}:`,
-                    error
-                );
-            }
-        }
+    const languageLoader = OPTIONAL_LANGUAGES[language];
+    if (!languageLoader) {
+        return;
+    }
+
+    // Get or create the promise map for this highlighter instance
+    if (!languageLoadPromises.has(highlighter)) {
+        languageLoadPromises.set(highlighter, new Map());
     }
+    const promiseMap = languageLoadPromises.get(highlighter)!;
+
+    // Reuse in-flight promise — prevents duplicate loadLanguage() calls
+    // when multiple code blocks request the same optional language concurrently
+    if (promiseMap.has(language)) {
+        return promiseMap.get(language);
+    }
+
+    const loadPromise = (async () => {
+        try {
+            await highlighter.loadLanguage(languageLoader);
+        } catch (error) {
+            promiseMap.delete(language); // allow retry on next call
+            console.warn(
+                `Failed to load optional language ${language}:`,
+                error
+            );
+        }
+    })();
+
+    promiseMap.set(language, loadPromise);
+    return loadPromise;
 }
 
 export function getMappedLanguage(language: string): BundledLanguage {
@@ -118,10 +143,11 @@ export function getMappedLanguage(language: string): BundledLanguage {
 }
 
 export function escapeHtml(text: string): string {
-    const div = document.createElement("div");
-    div.textContent = text;
-    // eslint-disable-next-line @lwc/lwc/no-inner-html
-    return div.innerHTML;
+    return text
+        .replace(/&/g, "&amp;")
+        .replace(/</g, "&lt;")
+        .replace(/>/g, "&gt;")
+        .replace(/"/g, "&quot;");
 }
 
 export function createShikiState(): ShikiState {

package/src/modules/dxUtils/shikiStatic/shikiStatic.ts

@@ -21,6 +21,21 @@ async function initializeShiki(): Promise<HighlighterCore> {
     return initializeHighlighter(shikiState, shikiModule);
 }
 
+/**
+ * Pre-warms the Shiki highlighter. Call once at SSG startup (before pages
+ * render) so code blocks don't pay the cold-start cost on first render.
+ */
+export async function preloadShiki(): Promise<void> {
+    await initializeShiki();
+}
+
+// Eagerly kick off initialization at module import time.
+// In SSG, this module is imported during LWR startup — by the time
+// the first code block renders, the highlighter will already be ready.
+initializeShiki().catch((err) => {
+    console.error("Shiki pre-warming failed:", err);
+});
+
 export async function highlightCode(
     code: string,
     language: string,

package/LICENSE

@@ -1,12 +0,0 @@
-Copyright (c) 2020, Salesforce.com, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-* Neither the name of Salesforce.com nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.