@salesforcedevs/dx-components 1.31.8-alpha.1 → 1.31.9-alpha10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dx-components",
-    "version": "1.31.8-alpha.1",
+    "version": "1.31.9-alpha10",
     "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": "603ae2f74f050fb351c48981ce44926b8dedb4f9"
+    }
 }

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/dx/codeBlock/codeBlock.ts

@@ -406,6 +406,7 @@ export default class CodeBlock extends LightningElement {
             ) || this.allLanguages[0];
         this.selectedLanguageLabel = this.selectedLanguage.label;
         this.selectedLanguageId = this.selectedLanguage.id;
+
         this.formatCodeBlock();
     }
 

package/src/modules/dxUtils/shiki/__mocks__/shiki.ts

@@ -35,7 +35,9 @@ export const createHighlighter = jest.fn().mockImplementation(() => {
                 "text",
                 "handlebars"
             ]),
-        loadLanguage: jest.fn().mockResolvedValue(undefined)
+        getLoadedThemes: jest.fn().mockReturnValue(["light-plus", "material-theme-darker"]),
+        loadLanguage: jest.fn().mockResolvedValue(undefined),
+        loadTheme: jest.fn().mockResolvedValue(undefined)
     });
 });
 
@@ -92,7 +94,9 @@ export const createHighlighterCore = jest.fn().mockImplementation(() => {
                 "text",
                 "handlebars"
             ]),
-        loadLanguage: jest.fn().mockResolvedValue(undefined)
+        getLoadedThemes: jest.fn().mockReturnValue(["light-plus", "material-theme-darker"]),
+        loadLanguage: jest.fn().mockResolvedValue(undefined),
+        loadTheme: jest.fn().mockResolvedValue(undefined)
     });
 });
 
@@ -107,5 +111,10 @@ export const createOnigurumaEngine = jest.fn().mockImplementation(() => {
     return Promise.resolve({});
 });
 
+// Mock for shiki/engine/javascript
+export const createJavaScriptRegexEngine = jest.fn().mockImplementation(() => {
+    return {};
+});
+
 // Mock for shiki/wasm - just return a promise that resolves to a buffer
 export default Promise.resolve(new ArrayBuffer(0));

package/src/modules/dxUtils/shiki/__mocks__/shikiLang.ts

@@ -0,0 +1,6 @@
+// Mock default export for individual shiki language grammar files (shiki/langs/*)
+export default {
+    name: "mock-lang",
+    scopeName: "source.mock",
+    patterns: []
+};

package/src/modules/dxUtils/shiki/__mocks__/shikiTheme.ts

@@ -0,0 +1,5 @@
+// Mock default export for individual shiki theme files (shiki/themes/*)
+export default {
+    name: "mock-theme",
+    type: "light" as const
+};

package/src/modules/dxUtils/shiki/shiki.ts

@@ -10,16 +10,22 @@ import {
 /**
  * Dynamic loading version of Shiki.
  * Uses dynamic import() for code splitting - shiki is lazy loaded on first use.
- * Note: May not work with SSG. Use dxUtils/shikiStatic for SSG compatibility.
+ * Uses createJavaScriptRegexEngine (no WASM) so it works in LWR at runtime.
  */
 
-let shikiModulePromise: Promise<typeof import("shiki")> | null = null;
+let shikiModulePromise: Promise<{
+    createHighlighterCore: any;
+    createJavaScriptRegexEngine: any;
+}> | null = null;
 let bracketsModulePromise: Promise<
     typeof import("@shikijs/colorized-brackets")
 > | null = null;
 
 async function getShiki() {
-    return (shikiModulePromise ??= import("shiki"));
+    return (shikiModulePromise ??= import("shiki").then((m) => ({
+        createHighlighterCore: m.createHighlighterCore,
+        createJavaScriptRegexEngine: m.createJavaScriptRegexEngine
+    })));
 }
 
 async function getBrackets() {
@@ -29,8 +35,8 @@ async function getBrackets() {
 const shikiState: ShikiState = createShikiState();
 
 async function initializeShiki(): Promise<HighlighterCore> {
-    const shikiModule = await getShiki();
-    return initializeHighlighter(shikiState, shikiModule);
+    const { createHighlighterCore, createJavaScriptRegexEngine } = await getShiki();
+    return initializeHighlighter(shikiState, { createHighlighterCore }, createJavaScriptRegexEngine());
 }
 
 export async function highlightCode(

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

@@ -2,9 +2,10 @@ import type { BundledLanguage, BundledTheme, HighlighterCore } from "shiki";
 import { getCustomLanguageGrammars } from "dxUtils/shikiGrammars";
 
 export interface ShikiModule {
-    createHighlighter: (options: {
-        themes: string[];
-        langs: BundledLanguage[];
+    createHighlighterCore: (options: {
+        themes: any[];
+        langs: any[];
+        engine: any;
     }) => Promise<HighlighterCore>;
 }
 
@@ -89,26 +90,86 @@ export const OPTIONAL_LANGUAGES: Record<string, any> = {
     agentscript: getCustomLanguageGrammars().agentscript
 };
 
+const languageLoadPromises = new WeakMap<
+    HighlighterCore,
+    Map<string, Promise<void>>
+>();
+
+const themeLoadPromises = new WeakMap<
+    HighlighterCore,
+    Map<string, Promise<void>>
+>();
+
+export async function loadThemeIfNeeded(
+    highlighter: HighlighterCore,
+    themeName: BundledTheme
+): Promise<void> {
+    if ((highlighter.getLoadedThemes() as string[]).includes(themeName)) {
+        return;
+    }
+
+    if (!themeLoadPromises.has(highlighter)) {
+        themeLoadPromises.set(highlighter, new Map());
+    }
+    const promiseMap = themeLoadPromises.get(highlighter)!;
+
+    if (promiseMap.has(themeName)) {
+        return promiseMap.get(themeName);
+    }
+
+    const loadPromise = (async () => {
+        try {
+            await highlighter.loadTheme(themeName);
+        } catch (error) {
+            promiseMap.delete(themeName);
+            console.warn(`Failed to load theme ${themeName}:`, error);
+        }
+    })();
+
+    promiseMap.set(themeName, loadPromise);
+    return loadPromise;
+}
+
 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 +179,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 {
@@ -134,7 +196,10 @@ export function createShikiState(): ShikiState {
 
 export async function initializeHighlighter(
     shikiState: ShikiState,
-    shikiModule: ShikiModule
+    shikiModule: ShikiModule,
+    engine: any,
+    langs?: any[],
+    themes?: any[]
 ): Promise<HighlighterCore> {
     if (shikiState.highlighter) {
         return shikiState.highlighter;
@@ -145,9 +210,10 @@ export async function initializeHighlighter(
     }
 
     shikiState.initPromise = (async () => {
-        const highlighter = await shikiModule.createHighlighter({
-            themes: ["light-plus", "material-theme-darker"],
-            langs: CORE_LANGUAGES
+        const highlighter = await shikiModule.createHighlighterCore({
+            themes: themes ?? [THEME_MAP.light],
+            langs: langs ?? CORE_LANGUAGES,
+            engine
         });
         shikiState.highlighter = highlighter;
         shikiState.initialized = true;
@@ -172,7 +238,11 @@ export async function highlightCodeWithShiki(
 ): Promise<string> {
     let mappedLanguage = getMappedLanguage(language);
 
-    await loadLanguageIfNeeded(highlighter, mappedLanguage);
+    const themeName = THEME_MAP[theme];
+    await Promise.all([
+        loadLanguageIfNeeded(highlighter, mappedLanguage),
+        loadThemeIfNeeded(highlighter, themeName)
+    ]);
 
     const loadedLanguages = highlighter.getLoadedLanguages();
     if (!loadedLanguages.includes(mappedLanguage)) {
@@ -181,7 +251,7 @@ export async function highlightCodeWithShiki(
 
     return highlighter.codeToHtml(code, {
         lang: mappedLanguage,
-        theme: THEME_MAP[theme],
+        theme: themeName,
         transformers: [transformerColorizedBrackets()],
         colorReplacements: THEME_MAP_COLOR_REPLACEMENTS[theme].colorReplacements
     });

package/src/modules/dxUtils/shikiGrammars/shikiGrammars.ts

@@ -1,4 +1,4 @@
-const dataweaveGrammar = {
+function createDataweaveGrammar() { return {
     name: "dataweave",
     scopeName: "source.data-weave",
     fileTypes: ["dwl"],
@@ -1121,7 +1121,7 @@ const dataweaveGrammar = {
             ]
         }
     }
-};
+}; }
 
 const ampscriptGrammar = {
     version: "2.0",
@@ -1300,7 +1300,7 @@ const ampscriptGrammar = {
     }
 };
 
-const agentscriptGrammar = {
+function createAgentscriptGrammar() { return {
     name: "agentscript",
     scopeName: "source.agentscript",
     fileTypes: ["agent"],
@@ -2479,12 +2479,12 @@ const agentscriptGrammar = {
             ]
         }
     }
-};
+}; }
 
 export function getCustomLanguageGrammars() {
     return {
-        dataweave: dataweaveGrammar,
+        dataweave: createDataweaveGrammar,
         ampscript: ampscriptGrammar,
-        agentscript: agentscriptGrammar
+        agentscript: createAgentscriptGrammar
     };
 }

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

@@ -1,6 +1,34 @@
-import type { HighlighterCore } from "shiki";
-import * as shikiModule from "shiki";
+import type { HighlighterCore } from "shiki/core";
+import { createHighlighterCore } from "shiki/core";
+import { createJavaScriptRegexEngine } from "shiki/engine/javascript";
 import { transformerColorizedBrackets } from "@shikijs/colorized-brackets";
+
+// Individual language grammars — the bundler only processes these ~19 files
+// instead of shiki's bundle-full.mjs which contains all 638 language factories.
+import apex from "shiki/langs/apex.mjs";
+import javascript from "shiki/langs/javascript.mjs";
+import html from "shiki/langs/html.mjs";
+import css from "shiki/langs/css.mjs";
+import json from "shiki/langs/json.mjs";
+import sql from "shiki/langs/sql.mjs";
+import bash from "shiki/langs/bash.mjs";
+import xml from "shiki/langs/xml.mjs";
+import graphql from "shiki/langs/graphql.mjs";
+import jsx from "shiki/langs/jsx.mjs";
+import typescript from "shiki/langs/typescript.mjs";
+import markdown from "shiki/langs/markdown.mjs";
+import python from "shiki/langs/python.mjs";
+import java from "shiki/langs/java.mjs";
+import yaml from "shiki/langs/yaml.mjs";
+import php from "shiki/langs/php.mjs";
+import swift from "shiki/langs/swift.mjs";
+import kotlin from "shiki/langs/kotlin.mjs";
+import handlebars from "shiki/langs/handlebars.mjs";
+
+// Individual themes — avoids loading all bundled themes.
+import lightPlusTheme from "shiki/themes/light-plus.mjs";
+import darkTheme from "shiki/themes/material-theme-darker.mjs";
+
 import {
     createShikiState,
     initializeHighlighter,
@@ -8,19 +36,45 @@ import {
     escapeHtml as coreEscapeHtml,
     ShikiState
 } from "dxUtils/shikiCore";
+import { getCustomLanguageGrammars } from "dxUtils/shikiGrammars";
 
 /**
- * Static loading version of Shiki.
- * Uses static imports - shiki is bundled with this module.
- * Use this for SSG compatibility and it is very specific to SSG generated components using LWR.
+ * Static loading version of Shiki for SSG.
+ * Imports from shiki/core + individual language/theme files so the bundler
+ * only processes what is actually used, instead of shiki's bundle-full.mjs
+ * (638 language factories).
  */
 
+// All languages loaded upfront — custom grammars are grammar objects already.
+const ALL_LANGUAGES = [
+    apex, javascript, html, css, json, sql, bash, xml, graphql, jsx,
+    typescript, markdown, python, java, yaml, php, swift, kotlin, handlebars,
+    getCustomLanguageGrammars().ampscript,
+    getCustomLanguageGrammars().dataweave,
+    getCustomLanguageGrammars().agentscript
+];
+
+// Both themes loaded upfront so theme switching has no cold-start cost.
+const ALL_THEMES = [lightPlusTheme, darkTheme];
+
 const shikiState: ShikiState = createShikiState();
 
 async function initializeShiki(): Promise<HighlighterCore> {
-    return initializeHighlighter(shikiState, shikiModule);
+    return initializeHighlighter(
+        shikiState,
+        { createHighlighterCore },
+        createJavaScriptRegexEngine(),
+        ALL_LANGUAGES,
+        ALL_THEMES
+    );
 }
 
+// Eagerly kick off initialization at module import time so Shiki is ready
+// before the first code block renders.
+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.