fix: Fix prism (#462)

MoegirlPediaInterfaceAdmins · Apr 22, 2024 · baeaa60 · baeaa60
1 parent 93cb35c
commit baeaa60
Show file tree

Hide file tree

Showing 22 changed files with 381 additions and 431 deletions.
diff --git a/scripts/prefetch/targets.yaml b/scripts/prefetch/targets.yaml
@@ -16,7 +16,7 @@
 
 - type: npm
   gadget:
-    name: prism-language-clike
+    name: prism-language-javascript
     fileName: MediaWiki:Gadget-prism-language-clike.js
   moduleName: prismjs
   distFilePath: components/prism-clike.js
@@ -54,22 +54,6 @@
   distFilePath: plugins/line-numbers/prism-line-numbers.css
   version: "1"
 
-- type: npm
-  gadget:
-    name: prism-core
-    fileName: MediaWiki:Gadget-prism-inline-color.js
-  moduleName: prismjs
-  distFilePath: plugins/inline-color/prism-inline-color.js
-  version: "1"
-
-- type: npm
-  gadget:
-    name: prism-core
-    fileName: MediaWiki:Gadget-prism-inline-color.css
-  moduleName: prismjs
-  distFilePath: plugins/inline-color/prism-inline-color.css
-  version: "1"
-
 - type: npm
   gadget:
     name: prism-language-css
@@ -144,6 +128,14 @@
   distFilePath: components/prism-markup.js
   version: "1"
 
+- type: npm
+  gadget:
+    name: prism-language-php
+    fileName: MediaWiki:Gadget-prism-language-markup-templating.js
+  moduleName: prismjs
+  distFilePath: components/prism-markup-templating.js
+  version: "1"
+
 - type: npm
   gadget:
     name: prism-language-php

diff --git a/src/gadgets/Gadgets-definition-list.yaml b/src/gadgets/Gadgets-definition-list.yaml
@@ -130,13 +130,13 @@
     - libJSON5
     - libCachedCode
     - prism-core
-    - prism-language-clike
     - prism-language-css
     - prism-language-javascript
     - prism-language-json
     - prism-language-latex
     - prism-language-lua
     - prism-language-markup
+    - prism-language-php
     - prism-language-regex
     - prism-language-typescript
     - prism-language-wiki
@@ -146,4 +146,3 @@
     - prism-plugin-match-braces
     - prism-plugin-phpdoc
     - prism-plugin-previewers
-    - prism-language-php
diff --git a/src/gadgets/prism-core/MediaWiki:Gadget-prism-inline-color.css b/src/gadgets/prism-core/MediaWiki:Gadget-prism-inline-color.css
diff --git a/src/gadgets/prism-core/MediaWiki:Gadget-prism-inline-color.js b/src/gadgets/prism-core/MediaWiki:Gadget-prism-inline-color.js
diff --git a/src/gadgets/prism-core/MediaWiki:Gadget-prism-loader.js b/src/gadgets/prism-core/MediaWiki:Gadget-prism-loader.js
@@ -0,0 +1,2 @@
+"use strict";
+window.Prism = { manual: true };
diff --git a/src/gadgets/prism-core/definition.yaml b/src/gadgets/prism-core/definition.yaml
@@ -31,11 +31,9 @@ _sites:
 _section: system
 
 _files:
+  - MediaWiki:Gadget-prism-loader.js
   - MediaWiki:Gadget-prism-core.js
   - MediaWiki:Gadget-prism-coy.css
 
   - MediaWiki:Gadget-prism-line-numbers.js
   - MediaWiki:Gadget-prism-line-numbers.css
-
-  - MediaWiki:Gadget-prism-inline-color.js
-  - MediaWiki:Gadget-prism-inline-color.css
diff --git a/src/gadgets/prism-language-clike/.eslintrc.yaml b/src/gadgets/prism-language-clike/.eslintrc.yaml
diff --git a/src/gadgets/prism-language-clike/definition.yaml b/src/gadgets/prism-language-clike/definition.yaml
diff --git a/src/gadgets/prism-language-javascript/.eslintrc.yaml b/src/gadgets/prism-language-javascript/.eslintrc.yaml
@@ -1,3 +1,4 @@
 ignorePatterns:
+  - MediaWiki:Gadget-prism-language-clike.js
   - MediaWiki:Gadget-prism-language-javascript.js
   - MediaWiki:Gadget-prism-language-javascript-extras.js
diff --git a/.../MediaWiki:Gadget-prism-language-clike.js → .../MediaWiki:Gadget-prism-language-clike.js b/.../MediaWiki:Gadget-prism-language-clike.js → .../MediaWiki:Gadget-prism-language-clike.js
@@ -2,7 +2,7 @@
  * Generated by scripts/prefetch/index.js
  * Options:
  *     type: "npm"
- *     gadget: { "name": "prism-language-clike", "fileName": "MediaWiki:Gadget-prism-language-clike.js" }
+ *     gadget: { "name": "prism-language-javascript", "fileName": "MediaWiki:Gadget-prism-language-clike.js" }
  *     moduleName: "prismjs"
  *     distFilePath: "components/prism-clike.js"
  *     version: "1"

diff --git a/src/gadgets/prism-language-javascript/definition.yaml b/src/gadgets/prism-language-javascript/definition.yaml
@@ -24,9 +24,6 @@ peers: []
 
 dependencies:
   - ext.gadget.prism-core
-  - ext.gadget.prism-language-clike
-  - ext.gadget.prism-language-regex
-  - ext.gadget.prism-language-markup
 
 _sites:
   - zh
@@ -35,5 +32,6 @@ _sites:
 _section: system
 
 _files:
+  - MediaWiki:Gadget-prism-language-clike.js
   - MediaWiki:Gadget-prism-language-javascript.js
   - MediaWiki:Gadget-prism-language-javascript-extras.js
diff --git a/src/gadgets/prism-language-php/.eslintrc.yaml b/src/gadgets/prism-language-php/.eslintrc.yaml
@@ -1,3 +1,4 @@
 ignorePatterns:
+  - MediaWiki:Gadget-prism-language-markup-templating.js
   - MediaWiki:Gadget-prism-language-php.js
   - MediaWiki:Gadget-prism-language-php-extras.js