merge: upstream

CHANGELOG.md

@@ -11,6 +11,10 @@
 
 -->
 
+## 0.24.0
+### Features
+- Supports Unicode 15.0 emoji
+
 ## 0.23.3
 - tweak fn parsing
 - fnNameList option removed

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sharkey/sfm-js",
-  "version": "0.23.3",
+  "version": "0.24.0",
   "description": "An SFM parser implementation with fixes based on MFM",
   "main": "./built/index.js",
   "types": "./built/index.d.ts",
@@ -23,20 +23,20 @@
   "author": "Marie",
   "license": "MIT",
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.28.4",
-    "@types/jest": "^28.1.4",
-    "@types/node": "18.0.3",
-    "@typescript-eslint/eslint-plugin": "^5.30.5",
-    "@typescript-eslint/parser": "^5.30.5",
-    "eslint": "^8.19.0",
-    "jest": "^28.1.2",
-    "ts-jest": "^28.0.5",
-    "ts-node": "10.8.2",
-    "tsd": "^0.22.0",
-    "typescript": "4.7.4"
+    "@microsoft/api-extractor": "7.38.5",
+    "@types/jest": "29.5.11",
+    "@types/node": "20.10.5",
+    "@typescript-eslint/eslint-plugin": "6.14.0",
+    "@typescript-eslint/parser": "6.14.0",
+    "eslint": "8.56.0",
+    "jest": "29.7.0",
+    "ts-jest": "29.1.1",
+    "ts-node": "10.9.2",
+    "tsd": "0.30.0",
+    "typescript": "5.3.3"
   },
   "dependencies": {
-    "twemoji-parser": "14.0.0"
+    "@twemoji/parser": "15.0.0"
   },
   "files": [
     "built",

src/@types/twemoji.d.ts

@@ -1,4 +1,4 @@
-declare module 'twemoji-parser/dist/lib/regex' {
+declare module '@twemoji/parser/dist/lib/regex' {
 	const regex: RegExp;
 	export default regex;
 }

src/internal/parser.ts

@@ -3,11 +3,11 @@ import * as P from './core';
 import { mergeText } from './util';
 
 // NOTE:
-// tsdのテストでファイルを追加しているにも関わらず「twemoji-parser/dist/lib/regex」の型定義ファイルがないとエラーが出るため、
+// tsdのテストでファイルを追加しているにも関わらず「@twemoji/parser/dist/lib/regex」の型定義ファイルがないとエラーが出るため、
 // このエラーを無視する。
 /* eslint @typescript-eslint/ban-ts-comment: 1 */
 // @ts-ignore
-import twemojiRegex from 'twemoji-parser/dist/lib/regex';
+import twemojiRegex from '@twemoji/parser/dist/lib/regex';
 
 type ArgPair = { k: string, v: string | true };
 type Args = Record<string, string | true>;