wikiplus-highlight 3.1.1 → 3.2.1

package/dist/main.js

@@ -9,23 +9,19 @@
     if (wphl === null || wphl === void 0 ? void 0 : wphl.version) {
         return;
     }
-    const version = '3.1.1';
+    const version = '3.2.1';
     libs.wphl = { version, ...wphl }; // 开始加载
     // 路径
-    const CDN = '//testingcf.jsdelivr.net', MW_CDN = `npm/@bhsd/codemirror-mediawiki@${libs.wphl.cmVersion || 'latest'}/dist/mw.min.js`, MONACO_CDN = `npm/monaco-wiki@${libs.wphl.monacoVersion || 'latest'}/dist/mw.min.js`, REPO_CDN = 'npm/wikiplus-highlight';
-    const useMonaco = wphl === null || wphl === void 0 ? void 0 : wphl.useMonaco;
-    if (useMonaco) {
-        window.MonacoWikiEditor || (window.MonacoWikiEditor = (async () => {
-            await $.ajax(`${CDN}/${MONACO_CDN}`, { dataType: 'script', scriptAttrs: { type: 'module' } });
-            return MonacoWikiEditor;
-        })());
-    }
-    else {
-        window.CodeMirror6 || (window.CodeMirror6 = (async () => {
-            await $.ajax(`${CDN}/${MW_CDN}`, { dataType: 'script', scriptAttrs: { type: 'module' } });
-            return CodeMirror6;
-        })());
-    }
+    const CDN = '//testingcf.jsdelivr.net', MW_CDN = `npm/@bhsd/codemirror-mediawiki@${libs.wphl.cmVersion || 'latest'}/dist/mw.min.js`, REPO_CDN = 'npm/wikiplus-highlight';
+    window.CodeMirror6 || (window.CodeMirror6 = new Promise(resolve => {
+        const script = document.createElement('script');
+        script.addEventListener('load', () => {
+            resolve(CodeMirror6);
+        });
+        script.type = 'module';
+        script.src = `${CDN}/${MW_CDN}`;
+        document.head.append(script);
+    }));
     const { wgPageName: page, wgNamespaceNumber: ns, wgPageContentModel: contentmodel, } = mw.config.get();
     const CONTENTMODELS = {
         'sanitized-css': 'css',
@@ -109,12 +105,13 @@
      * @param setting 是否是Wikiplus设置（使用json语法）
      */
     const renderEditor = async ($target, setting) => {
-        const settings = getObject('Wikiplus_Settings'), escToExitQuickEdit = settings && (settings['esc_to_exit_quickedit'] || settings['escToExitQuickEdit']);
-        if (useMonaco) {
-            const lang = setting ? 'json' : (await getPageMode($target.val()))[0], { editor } = await (await MonacoWikiEditor).fromTextArea($target[0], lang);
-            editor.getDomNode().id = 'Wikiplus-CodeMirror';
-            if (!setting) { // 普通Wikiplus编辑区
-                editor.onKeyUp(e => {
+        var _a;
+        const settings = getObject('Wikiplus_Settings'), escToExitQuickEdit = settings && (settings['esc_to_exit_quickedit'] || settings['escToExitQuickEdit']), esc = escToExitQuickEdit === true || escToExitQuickEdit === 'true';
+        const cm = await (await CodeMirror6).fromTextArea($target[0], ...setting ? ['json'] : await getPageMode($target.val()));
+        (((_a = cm.view) === null || _a === void 0 ? void 0 : _a.dom) || cm.editor.getDomNode()).id = 'Wikiplus-CodeMirror';
+        if (!setting) { // 普通Wikiplus编辑区
+            if (cm.editor) {
+                cm.editor.onKeyUp(e => {
                     if (e.keyCode === 49 && (e.ctrlKey || e.metaKey)) {
                         e.preventDefault();
                         if (e.shiftKey) {
@@ -124,49 +121,42 @@
                             submit();
                         }
                     }
-                    else if (e.keyCode === 9
-                        && (escToExitQuickEdit === true || escToExitQuickEdit === 'true')) {
+                    else if (e.keyCode === 9 && esc) {
                         e.preventDefault();
                         escapeEdit();
                     }
                 });
             }
-        }
-        else {
-            const cm = await (await CodeMirror6).fromTextArea($target[0], ...setting ? ['json'] : await getPageMode($target.val()));
-            cm.view.dom.id = 'Wikiplus-CodeMirror';
-            if (!setting) { // 普通Wikiplus编辑区
+            else {
                 cm.extraKeys([
                     { key: 'Mod-S', run: submit },
                     { key: 'Shift-Mod-S', run: submitMinor },
-                    ...escToExitQuickEdit === true || escToExitQuickEdit === 'true'
-                        ? [{ key: 'Esc', run: escapeEdit }]
-                        : [],
+                    ...esc ? [{ key: 'Esc', run: escapeEdit }] : [],
                 ]);
             }
-            /** @todo 以下过渡代码添加于2024-02-07，将于一段时间后弃用 */
-            const oldKey = 'Wikiplus-highlight-addons', oldPrefs = getObject(oldKey), mapping = {
-                activeLine: 'highlightActiveLine',
-                trailingspace: 'highlightTrailingWhitespace',
-                matchBrackets: 'bracketMatching',
-                closeBrackets: 'closeBrackets',
-                matchTags: 'tagMatching',
-                fold: 'codeFolding',
-                wikiEditor: 'wikiEditor',
-                escape: 'escape',
-                contextmenu: 'openLinks',
-                lint: 'lint',
-            };
-            localStorage.removeItem(oldKey);
-            if (oldPrefs) {
-                const obj = {};
-                for (const k of oldPrefs) {
-                    if (k in mapping) {
-                        obj[mapping[k]] = true;
-                    }
+        }
+        /** @todo 以下过渡代码添加于2024-02-07，将于一段时间后弃用 */
+        const oldKey = 'Wikiplus-highlight-addons', oldPrefs = getObject(oldKey), mapping = {
+            activeLine: 'highlightActiveLine',
+            trailingspace: 'highlightTrailingWhitespace',
+            matchBrackets: 'bracketMatching',
+            closeBrackets: 'closeBrackets',
+            matchTags: 'tagMatching',
+            fold: 'codeFolding',
+            wikiEditor: 'wikiEditor',
+            escape: 'escape',
+            contextmenu: 'openLinks',
+            lint: 'lint',
+        };
+        localStorage.removeItem(oldKey);
+        if (oldPrefs) {
+            const obj = {};
+            for (const k of oldPrefs) {
+                if (k in mapping) {
+                    obj[mapping[k]] = true;
                 }
-                cm.prefer(obj);
             }
+            cm.prefer(obj);
         }
         const jump = document.querySelector('#Wikiplus-Quickedit-Jump > a');
         if (jump) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiplus-highlight",
-	"version": "3.1.1",
+	"version": "3.2.1",
 	"description": "A plugin for the MediaWiki front-end add-on \"Wikiplus\"",
 	"keywords": [
 		"mediawiki",
@@ -29,11 +29,11 @@
 		"build": "tsc"
 	},
 	"devDependencies": {
-		"@bhsd/codemirror-mediawiki": "^2.6.8",
+		"@bhsd/codemirror-mediawiki": "^2.10.0",
 		"@stylistic/eslint-plugin": "^1.5.4",
 		"@stylistic/stylelint-plugin": "^2.0.0",
 		"@types/jquery": "^3.5.29",
-		"@types/oojs-ui": "^0.47.6",
+		"@types/oojs-ui": "^0.49.0",
 		"@typescript-eslint/eslint-plugin": "^7.1.0",
 		"@typescript-eslint/parser": "^7.1.0",
 		"eslint": "^8.56.0",
@@ -43,8 +43,8 @@
 		"eslint-plugin-json-es": "^1.5.7",
 		"eslint-plugin-promise": "^6.1.1",
 		"eslint-plugin-regexp": "^2.2.0",
-		"eslint-plugin-unicorn": "^51.0.1",
-		"monaco-wiki": "^0.2.0",
+		"eslint-plugin-unicorn": "^52.0.0",
+		"monaco-editor": "^0.48.0",
 		"stylelint": "^16.1.0",
 		"stylelint-config-recommended": "^14.0.0",
 		"types-mediawiki": "^1.4.0",