Issue Source Code Pro (versions 1.1.1 - 1.1.3) not working in Moodle …

…4.1.2 #16
jmulet · Nov 27, 2024 · 8c778b2 · 8c778b2
1 parent 058263a
commit 8c778b2
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 6 deletions.
diff --git a/amd/build/cm6pro-lazy.min.js b/amd/build/cm6pro-lazy.min.js
diff --git a/amd/build/cm6pro-lazy.min.js.map b/amd/build/cm6pro-lazy.min.js.map
diff --git a/amd/src/cm6pro-lazy.js b/amd/src/cm6pro-lazy.js
@@ -19226,7 +19226,8 @@ const treeHighlighter = /*@__PURE__*/Prec.high(/*@__PURE__*/ViewPlugin.fromClass
 /**
 A default highlight style (works well with light themes).
 */
-const defaultHighlightStyle = /*@__PURE__*/HighlightStyle.define([
+const HighlightStyleDefs = HighlightStyle.define;
+const defaultHighlightStyle = /*@__PURE__*/HighlightStyleDefs([
     { tag: tags$1.meta,
         color: "#404740" },
     { tag: tags$1.link,
@@ -28112,7 +28113,9 @@ const cm6proDarkTheme = EditorView.theme({
 /**
 The highlighting style for code in the CodePro Dark theme.
 */
-const cm6proDarkHighlightStyle = HighlightStyle.define([
+// Workaround issue requirejs Moodle4.1.2
+const HighlightStyleDef = HighlightStyle.define;
+const cm6proDarkHighlightStyle = HighlightStyleDef([
     { tag: tags$1.keyword, color: base_green },
     {
         tag: [tags$1.name, tags$1.deleted, tags$1.character, tags$1.propertyName, tags$1.macroName],

diff --git a/libs/codemirror/README.md b/libs/codemirror/README.md
@@ -14,4 +14,28 @@ And run the job defined in the `rollup.config.js` file
 npm run build
 ```
 
-If everything runs smoothly, the file amd/src/cm6pro-lazy.js will be generated. Then, you must compile it using the command `npx grunt amd`. The resulting minified version of this file will be lazy loaded on demand when the code editor is opened.
+
+If everything runs smoothly, the file amd/src/cm6pro-lazy.js will be generated.
+
+Open this file and add these lines to the top
+```
+/** @ts-ignore */
+/* eslint-disable */
+````
+
+### This is a workaround for an issue that appears when using requirejs in Moodle4.1.2
+
+Search for `define([` in the file and do the following replacement
+
+```
+const defaultHighlightStyle = /*@__PURE__*/HighlightStyle.define([
+```
+
+```
+const HighlightStyleDefs = HighlightStyle.define;
+const defaultHighlightStyle = /*@__PURE__*/HighlightStyleDefs([
+```
+
+
+
+Then, you must compile it using the command `npx grunt amd`. The resulting minified version of this file will be lazy loaded on demand when the code editor is opened.
diff --git a/libs/codemirror/cm6pro-dark-theme.js b/libs/codemirror/cm6pro-dark-theme.js
@@ -114,7 +114,9 @@ const cm6proDarkTheme = EditorView.theme({
 /**
 The highlighting style for code in the CodePro Dark theme.
 */
-const cm6proDarkHighlightStyle = HighlightStyle.define([
+// Workaround issue requirejs Moodle4.1.2
+const HighlightStyleDef = HighlightStyle.define;
+const cm6proDarkHighlightStyle = HighlightStyleDef([
     { tag: tags.keyword, color: base_green },
     {
         tag: [tags.name, tags.deleted, tags.character, tags.propertyName, tags.macroName],