From c18b8f9ed36498b9f825dfcc57caa40ffeb549c2 Mon Sep 17 00:00:00 2001 From: Rexogamer Date: Wed, 28 Aug 2024 18:08:16 +0100 Subject: [PATCH] feat!: switch to pipe spoilers exclamation mark spoilers are deprecated - this commit removes them in favour of their replacement --- ...down-it-spoiler-npm-1.1.6-ee0dc02626.patch | 36 ++++++++ .../markdown-it-npm-14.1.0-e337d75bfe.patch | 36 ++++++++ package.json | 6 +- yarn.lock | 90 +++++++++++-------- 4 files changed, 128 insertions(+), 40 deletions(-) create mode 100644 .yarn/patches/@traptitech-markdown-it-spoiler-npm-1.1.6-ee0dc02626.patch create mode 100644 .yarn/patches/markdown-it-npm-14.1.0-e337d75bfe.patch diff --git a/.yarn/patches/@traptitech-markdown-it-spoiler-npm-1.1.6-ee0dc02626.patch b/.yarn/patches/@traptitech-markdown-it-spoiler-npm-1.1.6-ee0dc02626.patch new file mode 100644 index 00000000..113b4ea1 --- /dev/null +++ b/.yarn/patches/@traptitech-markdown-it-spoiler-npm-1.1.6-ee0dc02626.patch @@ -0,0 +1,36 @@ +diff --git a/index.js b/index.js +index 601cb79ecd40dee024ee99e02da65937f1539e00..e9fbbb5f79840d0ab56586918db79f203168df92 100644 +--- a/index.js ++++ b/index.js +@@ -24,7 +24,7 @@ + * OTHER DEALINGS IN THE SOFTWARE. + */ + 'use strict' +-const exMark = 0x21 /* ! */ ++const exMark = 0x7C /* | */ + + const tokenize = frontPriorMode => (state, silent) => { + if (silent) return false +@@ -87,19 +87,19 @@ const postProcess = (state, delimiters) => { + tokenO.tag = "span" + tokenO.attrs = [["class", "spoiler"]] + tokenO.nesting = 1 +- tokenO.markup = "!!" ++ tokenO.markup = "||" + tokenO.content = "" + + const tokenC = state.tokens[endDelim.token] + tokenC.type = "spoiler_close" + tokenC.tag = "span" + tokenC.nesting = -1 +- tokenC.markup = "!!" ++ tokenC.markup = "||" + tokenC.content = "" + + if ( + state.tokens[endDelim.token - 1].type === "text" && +- state.tokens[endDelim.token - 1].content === "!" ++ state.tokens[endDelim.token - 1].content === "|" + ) { + loneMarkers.push(endDelim.token - 1) + } diff --git a/.yarn/patches/markdown-it-npm-14.1.0-e337d75bfe.patch b/.yarn/patches/markdown-it-npm-14.1.0-e337d75bfe.patch new file mode 100644 index 00000000..97a8230d --- /dev/null +++ b/.yarn/patches/markdown-it-npm-14.1.0-e337d75bfe.patch @@ -0,0 +1,36 @@ +diff --git a/dist/index.cjs.js b/dist/index.cjs.js +index 5ba2eaa14a8565465f40b453437b0226683b56e6..0df5c2690333873324da1f092427f027507e601c 100644 +--- a/dist/index.cjs.js ++++ b/dist/index.cjs.js +@@ -3680,6 +3680,7 @@ function isTerminatorChar(ch) { + case 0x5F /* _ */: + case 0x60 /* ` */: + case 0x7B /* { */: ++ case 0x7C /* | */: + case 0x7D /* } */: + case 0x7E /* ~ */: + return true; +diff --git a/dist/markdown-it.js b/dist/markdown-it.js +index 3a9d89cec6e1a56ee68a68a14103c516d5e8b864..33433e8aa18955ef0814b3f8a3db0fee94fef1a4 100644 +--- a/dist/markdown-it.js ++++ b/dist/markdown-it.js +@@ -4292,6 +4292,7 @@ + case 95 /* _ */ : + case 96 /* ` */ : + case 123 /* { */ : ++ case 124 /* | */ : + case 125 /* } */ : + case 126 /* ~ */ : + return true; +diff --git a/lib/rules_inline/text.mjs b/lib/rules_inline/text.mjs +index 9be42274c599ad2211de862104b979af134000d4..102f53550e11e82c6821dd3cf38b85ddddd2c708 100644 +--- a/lib/rules_inline/text.mjs ++++ b/lib/rules_inline/text.mjs +@@ -31,6 +31,7 @@ function isTerminatorChar (ch) { + case 0x5F/* _ */: + case 0x60/* ` */: + case 0x7B/* { */: ++ case 0x7C/* | */: + case 0x7D/* } */: + case 0x7E/* ~ */: + return true diff --git a/package.json b/package.json index bb4dd772..014f8603 100644 --- a/package.json +++ b/package.json @@ -21,13 +21,12 @@ "@react-native-community/hooks": "^3.0.0", "@rexovolt/notifee": "^9.0.2", "@rexovolt/react-native-side-menu": "^2.0.0", - "@traptitech/markdown-it-spoiler": "^1.1.6", + "@traptitech/markdown-it-spoiler": "patch:@traptitech/markdown-it-spoiler@npm%3A1.1.6#~/.yarn/patches/@traptitech-markdown-it-spoiler-npm-1.1.6-ee0dc02626.patch", "@xmldom/xmldom": "^0.8.10", "babel-plugin-module-resolver": "^5.0.2", "date-fns": "^3.6.0", "i18next": "^23.14.0", "intl-pluralrules": "^2.0.1", - "markdown-it-regexp": "^0.4.0", "mobx": "^6.13.1", "mobx-react-lite": "^4.0.7", "react": "^18.3.1", @@ -94,6 +93,7 @@ }, "packageManager": "yarn@4.4.0", "resolutions": { - "@react-native/gradle-plugin@npm:0.75.0-rc.6": "patch:@react-native/gradle-plugin@npm%3A0.75.0-rc.6#~/.yarn/patches/@react-native-gradle-plugin-npm-0.75.0-rc.6-3d2b8a2db4.patch" + "@react-native/gradle-plugin@npm:0.75.0-rc.6": "patch:@react-native/gradle-plugin@npm%3A0.75.0-rc.6#~/.yarn/patches/@react-native-gradle-plugin-npm-0.75.0-rc.6-3d2b8a2db4.patch", + "markdown-it": "patch:markdown-it@npm%3A14.1.0#~/.yarn/patches/markdown-it-npm-14.1.0-e337d75bfe.patch" } } diff --git a/yarn.lock b/yarn.lock index 7b09d0d0..a07a6c7f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4858,13 +4858,20 @@ __metadata: languageName: node linkType: hard -"@traptitech/markdown-it-spoiler@npm:^1.1.6": +"@traptitech/markdown-it-spoiler@npm:1.1.6": version: 1.1.6 resolution: "@traptitech/markdown-it-spoiler@npm:1.1.6" checksum: 10c0/f8bc27760ff357102e7bbf7532c97e45923b2734b368ca91dc8d8e0e344cc5b87d49e5b2655e45ceba959e0aec2122eb86a3d885800a4dc5267d57be52a8f734 languageName: node linkType: hard +"@traptitech/markdown-it-spoiler@patch:@traptitech/markdown-it-spoiler@npm%3A1.1.6#~/.yarn/patches/@traptitech-markdown-it-spoiler-npm-1.1.6-ee0dc02626.patch": + version: 1.1.6 + resolution: "@traptitech/markdown-it-spoiler@patch:@traptitech/markdown-it-spoiler@npm%3A1.1.6#~/.yarn/patches/@traptitech-markdown-it-spoiler-npm-1.1.6-ee0dc02626.patch::version=1.1.6&hash=bbdf56" + checksum: 10c0/c2ef26815b9a099852712d5a69ed75671eebcc836536f918421b26c0205445ecefc04140a85311fc4a7c0a8f16eee13d6529c14342243270e88f8b9b24b07316 + languageName: node + linkType: hard + "@trysound/sax@npm:0.2.0": version: 0.2.0 resolution: "@trysound/sax@npm:0.2.0" @@ -8018,13 +8025,6 @@ __metadata: languageName: node linkType: hard -"entities@npm:~2.0.0": - version: 2.0.3 - resolution: "entities@npm:2.0.3" - checksum: 10c0/81463fde5f1e4432df6faa65afa00021f3979ac8387f81d3d111beeb08179e626130a4b7488e8c3cc3d74e0d04e99d3033ff7db80e05f4a1e961b5e1efe17731 - languageName: node - linkType: hard - "env-paths@npm:^2.2.0, env-paths@npm:^2.2.1": version: 2.2.1 resolution: "env-paths@npm:2.2.1" @@ -11208,12 +11208,12 @@ __metadata: languageName: node linkType: hard -"linkify-it@npm:^2.0.0": - version: 2.2.0 - resolution: "linkify-it@npm:2.2.0" +"linkify-it@npm:^5.0.0": + version: 5.0.0 + resolution: "linkify-it@npm:5.0.0" dependencies: - uc.micro: "npm:^1.0.1" - checksum: 10c0/640f926fa71d46f9451b4dc999c94b2dcad920abf5fe174a85f120b420cbb34b8f950e251846ed73db715ec9aaadadf1f2482d27088dddd21b1c84761f6a0b5a + uc.micro: "npm:^2.0.0" + checksum: 10c0/ff4abbcdfa2003472fc3eb4b8e60905ec97718e11e33cca52059919a4c80cc0e0c2a14d23e23d8c00e5402bc5a885cdba8ca053a11483ab3cc8b3c7a52f88e2d languageName: node linkType: hard @@ -11476,25 +11476,35 @@ __metadata: languageName: node linkType: hard -"markdown-it-regexp@npm:^0.4.0": - version: 0.4.0 - resolution: "markdown-it-regexp@npm:0.4.0" - checksum: 10c0/14052b014434080c177d1635760e67c6cb0a13748cb58f9a4a63940e4433fc3762d4e10e108d1e019754ab9229b6a36c9561430d9bd7d02f681e4106b3ee66dc +"markdown-it@npm:14.1.0": + version: 14.1.0 + resolution: "markdown-it@npm:14.1.0" + dependencies: + argparse: "npm:^2.0.1" + entities: "npm:^4.4.0" + linkify-it: "npm:^5.0.0" + mdurl: "npm:^2.0.0" + punycode.js: "npm:^2.3.1" + uc.micro: "npm:^2.1.0" + bin: + markdown-it: bin/markdown-it.mjs + checksum: 10c0/9a6bb444181d2db7016a4173ae56a95a62c84d4cbfb6916a399b11d3e6581bf1cc2e4e1d07a2f022ae72c25f56db90fbe1e529fca16fbf9541659dc53480d4b4 languageName: node linkType: hard -"markdown-it@npm:^10.0.0": - version: 10.0.0 - resolution: "markdown-it@npm:10.0.0" +"markdown-it@patch:markdown-it@npm%3A14.1.0#~/.yarn/patches/markdown-it-npm-14.1.0-e337d75bfe.patch": + version: 14.1.0 + resolution: "markdown-it@patch:markdown-it@npm%3A14.1.0#~/.yarn/patches/markdown-it-npm-14.1.0-e337d75bfe.patch::version=14.1.0&hash=0fef60" dependencies: - argparse: "npm:^1.0.7" - entities: "npm:~2.0.0" - linkify-it: "npm:^2.0.0" - mdurl: "npm:^1.0.1" - uc.micro: "npm:^1.0.5" + argparse: "npm:^2.0.1" + entities: "npm:^4.4.0" + linkify-it: "npm:^5.0.0" + mdurl: "npm:^2.0.0" + punycode.js: "npm:^2.3.1" + uc.micro: "npm:^2.1.0" bin: - markdown-it: bin/markdown-it.js - checksum: 10c0/7b2876599adb4c8bed0b45030db835d6e3e352e20b1c26624975d1b0f6d9ef54bbf6b63d29cb31b0cebb65b5ad7300aad063dc5d586a03c3745345bfc945c8fd + markdown-it: bin/markdown-it.mjs + checksum: 10c0/9fdde97d1b6c9be47914eb00bde35158e3f1c3ffa9cfb54f9047c3625991bcf54db467e3f0aa96c625f2dde46f088f9cacb6ca4f69d7ecca02a8457a1c08c207 languageName: node linkType: hard @@ -11535,10 +11545,10 @@ __metadata: languageName: node linkType: hard -"mdurl@npm:^1.0.1": - version: 1.0.1 - resolution: "mdurl@npm:1.0.1" - checksum: 10c0/ea8534341eb002aaa532a722daef6074cd8ca66202e10a2b4cda46722c1ebdb1da92197ac300bc953d3ef1bf41cd6561ef2cc69d82d5d0237dae00d4a61a4eee +"mdurl@npm:^2.0.0": + version: 2.0.0 + resolution: "mdurl@npm:2.0.0" + checksum: 10c0/633db522272f75ce4788440669137c77540d74a83e9015666a9557a152c02e245b192edc20bc90ae953bbab727503994a53b236b4d9c99bdaee594d0e7dd2ce0 languageName: node linkType: hard @@ -13277,6 +13287,13 @@ __metadata: languageName: node linkType: hard +"punycode.js@npm:^2.3.1": + version: 2.3.1 + resolution: "punycode.js@npm:2.3.1" + checksum: 10c0/1d12c1c0e06127fa5db56bd7fdf698daf9a78104456a6b67326877afc21feaa821257b171539caedd2f0524027fa38e67b13dd094159c8d70b6d26d2bea4dfdb + languageName: node + linkType: hard + "punycode@npm:^2.1.0": version: 2.3.1 resolution: "punycode@npm:2.3.1" @@ -14257,7 +14274,7 @@ __metadata: "@rnx-kit/metro-plugin-duplicates-checker": "npm:^2.1.3" "@rnx-kit/metro-serializer": "npm:^1.0.14" "@svgr/webpack": "npm:^8.1.0" - "@traptitech/markdown-it-spoiler": "npm:^1.1.6" + "@traptitech/markdown-it-spoiler": "patch:@traptitech/markdown-it-spoiler@npm%3A1.1.6#~/.yarn/patches/@traptitech-markdown-it-spoiler-npm-1.1.6-ee0dc02626.patch" "@types/assert": "npm:^1.5.10" "@types/babel__core": "npm:^7.20.5" "@types/eslint": "npm:^8.56.12" @@ -14280,7 +14297,6 @@ __metadata: i18next: "npm:^23.14.0" intl-pluralrules: "npm:^2.0.1" jest: "npm:^29.7.0" - markdown-it-regexp: "npm:^0.4.0" mobx: "npm:^6.13.1" mobx-react-lite: "npm:^4.0.7" prettier: "npm:^2.8.8" @@ -15527,10 +15543,10 @@ __metadata: languageName: node linkType: hard -"uc.micro@npm:^1.0.1, uc.micro@npm:^1.0.5": - version: 1.0.6 - resolution: "uc.micro@npm:1.0.6" - checksum: 10c0/9bde2afc6f2e24b899db6caea47dae778b88862ca76688d844ef6e6121dec0679c152893a74a6cfbd2e6fde34654e6bd8424fee8e0166cdfa6c9ae5d42b8a17b +"uc.micro@npm:^2.0.0, uc.micro@npm:^2.1.0": + version: 2.1.0 + resolution: "uc.micro@npm:2.1.0" + checksum: 10c0/8862eddb412dda76f15db8ad1c640ccc2f47cdf8252a4a30be908d535602c8d33f9855dfcccb8b8837855c1ce1eaa563f7fa7ebe3c98fd0794351aab9b9c55fa languageName: node linkType: hard