Merge branch 'main' into fix-md-c

facebook · Sep 20, 2024 · dc08b44 · dc08b44
2 parents 2588ed5 + 4cf0a53
commit dc08b44
Show file tree

Hide file tree

Showing 7 changed files with 499 additions and 335 deletions.
diff --git a/packages/lexical-code/package.json b/packages/lexical-code/package.json
@@ -25,7 +25,7 @@
     "@types/prismjs": "^1.26.0"
   },
   "module": "LexicalCode.mjs",
-  "sideEffects": false,
+  "sideEffects": true,
   "exports": {
     ".": {
       "import": {

diff --git a/packages/lexical-code/src/CodeHighlightNode.ts b/packages/lexical-code/src/CodeHighlightNode.ts
@@ -17,8 +17,6 @@ import type {
   TabNode,
 } from 'lexical';
 
-import './CodeHighlighterPrism';
-
 import {
   addClassNamesToElement,
   removeClassNamesFromElement,
@@ -30,6 +28,7 @@ import {
   TextNode,
 } from 'lexical';
 
+import {Prism} from './CodeHighlighterPrism';
 import {$createCodeNode} from './CodeNode';
 
 export const DEFAULT_CODE_LANGUAGE = 'javascript';
@@ -84,11 +83,11 @@ export function getLanguageFriendlyName(lang: string) {
 export const getDefaultCodeLanguage = (): string => DEFAULT_CODE_LANGUAGE;
 
 export const getCodeLanguages = (): Array<string> =>
-  Object.keys(window.Prism.languages)
+  Object.keys(Prism.languages)
     .filter(
       // Prism has several language helpers mixed into languages object
       // so filtering them out here to get langs list
-      (language) => typeof window.Prism.languages[language] !== 'function',
+      (language) => typeof Prism.languages[language] !== 'function',
     )
     .sort();
 

diff --git a/packages/lexical-code/src/CodeHighlighter.ts b/packages/lexical-code/src/CodeHighlighter.ts
@@ -16,8 +16,6 @@ import type {
   RangeSelection,
 } from 'lexical';
 
-import './CodeHighlighterPrism';
-
 import {mergeRegister} from '@lexical/utils';
 import {
   $createLineBreakNode,
@@ -44,6 +42,7 @@ import {
 } from 'lexical';
 import invariant from 'shared/invariant';
 
+import {Prism} from './CodeHighlighterPrism';
 import {
   $createCodeHighlightNode,
   $isCodeHighlightNode,
@@ -69,10 +68,9 @@ export interface Tokenizer {
 export const PrismTokenizer: Tokenizer = {
   defaultLanguage: DEFAULT_CODE_LANGUAGE,
   tokenize(code: string, language?: string): (string | Token)[] {
-    return window.Prism.tokenize(
+    return Prism.tokenize(
       code,
-      window.Prism.languages[language || ''] ||
-        window.Prism.languages[this.defaultLanguage],
+      Prism.languages[language || ''] || Prism.languages[this.defaultLanguage],
     );
   },
 };

diff --git a/packages/lexical-code/src/CodeHighlighterPrism.ts b/packages/lexical-code/src/CodeHighlighterPrism.ts
@@ -24,14 +24,5 @@ import 'prismjs/components/prism-swift';
 import 'prismjs/components/prism-typescript';
 import 'prismjs/components/prism-java';
 import 'prismjs/components/prism-cpp';
-import {CAN_USE_DOM} from 'shared/canUseDOM';
 
-declare global {
-  interface Window {
-    Prism: typeof import('prismjs');
-  }
-}
-
-export const Prism: typeof import('prismjs') = CAN_USE_DOM
-  ? window.Prism
-  : (global as unknown as {Prism: typeof import('prismjs')}).Prism;
+export const Prism: typeof import('prismjs') = globalThis.Prism || window.Prism;