build: update packages (qiuwenbaike#1772)

* build: update packages

* build: update packages

update SVGO settings

* build: update packages

bump Wikiplus-highlight to version 3.2.8

Author: WaitSpringQW

dist/Wikiplus-highlight/Wikiplus-highlight.js

@@ -47,16 +47,16 @@
 		"MediaWiki Gadget"
 	],
 	"dependencies": {
-		"@bhsd/codemirror-mediawiki": "^2.25.3",
-		"@bhsd/common": "^0.10.2",
-		"@types/toastify-js": "^1.12.3",
+		"@bhsd/codemirror-mediawiki": "^2.30.1",
+		"@bhsd/common": "^0.14.1",
+		"@types/toastify-js": "^1.12.4",
 		"chinese-days": "^1.5.1",
 		"clipboard": "^2.0.11",
 		"filter-altered-clicks": "^2.1.1",
 		"jsx-dom": "^8.1.6",
 		"monaco-editor": "^0.52.2",
 		"select2": "^4.0.13",
-		"svgo": "^3.3.2",
+		"svgo": "^4.0.0",
 		"tippy.js": "^6.3.7",
 		"toastify-js": "^1.12.0"
 	},

package.json

@@ -3,7 +3,6 @@ import {getObject} from '@bhsd/common';
 const {wgPageName: page, wgNamespaceNumber: ns, wgPageContentModel: contentmodel} = mw.config.get();
 
 const CONTENTMODELS: Record<string, string> = {
-		'sanitized-css': 'css',
 		wikitext: 'mediawiki',
 	},
 	EXTS: Record<string, string> = {
@@ -50,10 +49,16 @@ const getPageMode = async (value: string): Promise<[string, (number | undefined)
 					return 'mediawiki';
 				}
 				const mode = EXTS[t.getExtension()?.toLowerCase() ?? ''] ?? NAMESPACES[namespace];
-				if (mode) {
-					return mode === 'javascript' && (namespace === 8 || namespace === 2300) ? 'gadget' : mode;
+				switch (mode) {
+					case 'javascript':
+						return namespace === 8 || namespace === 2300 ? 'gadget' : mode;
+					case 'css':
+						return namespace === 2 || namespace === 8 || namespace === 2300 ? mode : 'sanitized-css';
+					case undefined:
+						return namespace === 10 || namespace === 2 ? 'template' : 'mediawiki';
+					default:
+						return mode;
 				}
-				return namespace === 10 || namespace === 2 ? 'template' : 'mediawiki';
 			})
 		);
 		if (modes.size === 1) {
@@ -106,13 +111,13 @@ const submit = /** 提交编辑 */ (): true => {
 /**
  * 渲染编辑器
  *
- * @param $target 目标编辑框
+ * @param target 目标编辑框
  * @param setting 是否是Wikiplus设置（使用json语法）
  */
-export const renderEditor = async ($target: JQuery<HTMLTextAreaElement>, setting: boolean): Promise<void> => {
+export const renderEditor = async (target: HTMLTextAreaElement, setting: boolean): Promise<void> => {
 	const cm = await CodeMirror6.fromTextArea(
-		$target[0]!,
-		...(setting ? (['json'] satisfies [string]) : await getPageMode($target.val()!))
+		target,
+		...(setting ? (['json'] satisfies [string]) : await getPageMode(target.value))
 	);
 	(cm.view?.dom ?? cm.editor!.getDomNode()!).id = 'Wikiplus-CodeMirror';
 

pnpm-lock.yaml

@@ -10,6 +10,7 @@ type WikiplusPages = Record<number, {title: string; sectionCache: Record<string,
 
 declare global {
 	const CodeMirror6: {
+		instances?: WeakMap<HTMLTextAreaElement, CodeMirror>;
 		fromTextArea(textarea: HTMLTextAreaElement, lang?: string, ns?: number, page?: string): Promise<CodeMirror>;
 	};
 

src/Wikiplus-highlight/modules/core.ts

@@ -14,27 +14,38 @@ declare namespace mediaWiki.libs {
 	const {libs} = mediaWiki,
 		{wphl} = libs;
 	if (!wphl?.version) {
-		const version = '3.2.5';
+		const version = '3.2.8';
 		libs.wphl = {version, ...wphl}; // 开始加载
 
 		// 路径
 		const MW_CDN = `npm/@bhsd/codemirror-mediawiki@${libs.wphl.cmVersion ?? 'latest'}/dist/wiki.min.js`,
 			REPO_CDN = 'npm/wikiplus-highlight';
 
 		if (typeof CodeMirror6 !== 'function') {
-			await $.ajax(`${CDN}/${MW_CDN}`, {dataType: 'script'});
+			await $.ajax(`${CDN}/${MW_CDN}`, {dataType: 'script', cache: true});
 		}
 
 		// 监视 Wikiplus 编辑框
 		const observer = new MutationObserver((records) => {
-			const $editArea = $(
-				records.flatMap(({addedNodes}) => {
-					return [...addedNodes];
-				})
-			).find<HTMLTextAreaElement>('#Wikiplus-Quickedit, #Wikiplus-Setting-Input');
-			if ($editArea.length > 0) {
-				void renderEditor($editArea, $editArea.attr('id') === 'Wikiplus-Setting-Input');
+			const selector = '#Wikiplus-Quickedit, #Wikiplus-Setting-Input',
+				[added] = $(
+					records.flatMap(({addedNodes}) => {
+						return [...addedNodes];
+					})
+				).find<HTMLTextAreaElement>(selector);
+			if (added) {
+				void renderEditor(added, added.id === 'Wikiplus-Setting-Input');
 			}
+			const [removed] = $(
+					records.flatMap(({removedNodes}) => {
+						return [...removedNodes];
+					})
+				).find<HTMLTextAreaElement>(selector),
+				cm = CodeMirror6.instances?.get(removed!);
+			if (typeof cm?.destroy === 'function') {
+				cm.destroy();
+			}
+			Object.assign(globalThis, {records});
 		});
 		observer.observe(document.body, {childList: true});
 

src/Wikiplus-highlight/modules/index.d.ts

@@ -9,11 +9,6 @@ module.exports = {
 	plugins: [
 		{
 			name: 'preset-default',
-			params: {
-				overrides: {
-					removeViewBox: false,
-				},
-			},
 		},
 		'convertStyleToAttrs',
 		'removeRasterImages',