From e2d5731cf2cd2e344e8b91cbabcd2d6bc7eb6c14 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Fri, 2 Dec 2022 19:16:41 -0500 Subject: [PATCH 1/8] [O] New format --- info-i18n.yml | 12 ++++++++++++ people/GLaDOSister/info.json5 | 11 ++++------- people/GLaDOSister/info.zh_hant.json5 | 14 -------------- people/GLaDOSister/page.md | 7 +++++++ people/MioCardMeow/info.json5 | 13 +++++-------- people/MioCardMeow/info.zh_hant.json5 | 14 -------------- people/MioCardMeow/page.md | 7 +++++++ people/MizuharaNagisa/info.json5 | 11 ++++------- people/MizuharaNagisa/info.zh_hant.json5 | 14 -------------- people/MizuharaNagisa/page.md | 7 +++++++ people/SevenBird/info.json5 | 13 +++++-------- people/SevenBird/info.zh_hant.json5 | 14 -------------- people/SevenBird/page.md | 7 +++++++ people/Uekawakuyuurei/info.json5 | 13 +++++-------- people/Uekawakuyuurei/info.zh_hant.json5 | 15 --------------- people/Uekawakuyuurei/page.md | 7 +++++++ people/donotexist_A/info.json5 | 13 +++++-------- people/donotexist_A/info.zh_hant.json5 | 14 -------------- people/donotexist_A/page.md | 7 +++++++ people/gaoyanger/info.json5 | 13 +++++-------- people/gaoyanger/info.zh_hant.json5 | 15 --------------- people/gaoyanger/page.md | 7 +++++++ people/noname/info.json5 | 9 +-------- people/noname/info.zh_hant.json5 | 14 -------------- people/noname/page.md | 6 ++++++ 25 files changed, 101 insertions(+), 176 deletions(-) create mode 100644 info-i18n.yml delete mode 100644 people/GLaDOSister/info.zh_hant.json5 delete mode 100644 people/MioCardMeow/info.zh_hant.json5 delete mode 100644 people/MizuharaNagisa/info.zh_hant.json5 delete mode 100644 people/SevenBird/info.zh_hant.json5 delete mode 100644 people/Uekawakuyuurei/info.zh_hant.json5 delete mode 100644 people/donotexist_A/info.zh_hant.json5 delete mode 100644 people/gaoyanger/info.zh_hant.json5 delete mode 100644 people/noname/info.zh_hant.json5 diff --git a/info-i18n.yml b/info-i18n.yml new file mode 100644 index 00000000..fc51f569 --- /dev/null +++ b/info-i18n.yml @@ -0,0 +1,12 @@ +zh_hans: + key: + alias: 昵称 + location: 地区 + born: 出生 + died: 逝世 +zh_hant: + key: + alias: 暱稱 + location: 地區 + born: 出生 + died: 逝世 diff --git a/people/GLaDOSister/info.json5 b/people/GLaDOSister/info.json5 index 0e14bac0..ad0d9738 100644 --- a/people/GLaDOSister/info.json5 +++ b/people/GLaDOSister/info.json5 @@ -1,13 +1,10 @@ { id: 'GLaDOSister', - name: '倉山静葉', profileUrl: '${path}/photos/profile.jpg', - info: [ - ['昵称', '静叶、G姐'], - ['地区', '中国北京'], - ['出生', '1997.1.13'], - ['逝世', '2019.12.3'], - ], + info: { + born: "1997-01-13", + died: "2019-12-03" + }, websites: [ ['zhihu', 'https://www.zhihu.com/people/gmjyxx'], ], diff --git a/people/GLaDOSister/info.zh_hant.json5 b/people/GLaDOSister/info.zh_hant.json5 deleted file mode 100644 index 79ea9944..00000000 --- a/people/GLaDOSister/info.zh_hant.json5 +++ /dev/null @@ -1,14 +0,0 @@ -{ - id: 'GLaDOSister', - name: '倉山靜葉', - profileUrl: '${path}/photos/profile.jpg', - info: [ - ['暱稱', '靜葉、G姐'], - ['地區', '中國北京'], - ['出生', '1997.1.13'], - ['逝世', '2019.12.3'], - ], - websites: [ - ['zhihu', 'https://www.zhihu.com/people/gmjyxx'], - ], -} diff --git a/people/GLaDOSister/page.md b/people/GLaDOSister/page.md index 10147f92..1269e724 100644 --- a/people/GLaDOSister/page.md +++ b/people/GLaDOSister/page.md @@ -1,3 +1,10 @@ +--- +name: 倉山静葉 +info: + alias: 静叶、G姐 + location: 中国北京 +--- + ## 简介 正如她的签名所写，静叶是「一只可爱的语言学女孩」。 diff --git a/people/MioCardMeow/info.json5 b/people/MioCardMeow/info.json5 index 3f28fa08..9d6c877a 100644 --- a/people/MioCardMeow/info.json5 +++ b/people/MioCardMeow/info.json5 @@ -1,14 +1,11 @@ { id: 'MioCardMeow', - name: '澪卡喵', profileUrl: '${path}/photos/profile.jpg', - info: [ - ['昵称', '澪卡喵'], - ['地区', '中国'], - ['出生', '2005.4.2'], - ['逝世', '2022.1.31'], - ], + info: { + born: "2005-04-02", + died: "2022-01-31" + }, websites: [ ['twitter', 'https://twitter.com/MiocardMeow'], ], -} \ No newline at end of file +} diff --git a/people/MioCardMeow/info.zh_hant.json5 b/people/MioCardMeow/info.zh_hant.json5 deleted file mode 100644 index cf23de82..00000000 --- a/people/MioCardMeow/info.zh_hant.json5 +++ /dev/null @@ -1,14 +0,0 @@ -{ - id: 'MioCardMeow', - name: '澪卡喵', - profileUrl: '${path}/photos/profile.jpg', - info: [ - ['暱稱', '澪卡喵'], - ['地區', '中國'], - ['出生', '2005.4.2'], - ['逝世', '2022.1.31'], - ], - websites: [ - ['twitter', 'https://twitter.com/MiocardMeow'], - ], -} \ No newline at end of file diff --git a/people/MioCardMeow/page.md b/people/MioCardMeow/page.md index 39c27b58..d1710db2 100644 --- a/people/MioCardMeow/page.md +++ b/people/MioCardMeow/page.md @@ -1,3 +1,10 @@ +--- +name: 澪卡喵 +info: + alias: 澪卡喵 + location: 中国 +--- + ## 简介 [澪卡喵](https://twitter.com/MiocardMeow) ，一名跨性别女性，于 2022 年 1 月 31 日凌晨医治无效逝世。该消息于 2022 年 2 月 14 日由 [喵小白](https://twitter.com/pizyj/status/1492928433172582400?s=21) 发布。 diff --git a/people/MizuharaNagisa/info.json5 b/people/MizuharaNagisa/info.json5 index e343fab0..f42a0f09 100644 --- a/people/MizuharaNagisa/info.json5 +++ b/people/MizuharaNagisa/info.json5 @@ -1,13 +1,10 @@ { id: 'MizuharaNagisa', - name: '水原なぎさ', profileUrl: '${path}/photos/profile.png', - info: [ - ['昵称', '水原なぎさ'], - ['地区', '上海'], - ['出生', '2002.4.19'], - ['逝世', '2021.7.21'], - ], + info: { + born: "2002-04-19", + died: "2021-07-21" + }, websites: [ ['twitter', 'https://twitter.com/MizuharaNagisa'], ], diff --git a/people/MizuharaNagisa/info.zh_hant.json5 b/people/MizuharaNagisa/info.zh_hant.json5 deleted file mode 100644 index 8a0d21e9..00000000 --- a/people/MizuharaNagisa/info.zh_hant.json5 +++ /dev/null @@ -1,14 +0,0 @@ -{ - id: 'MizuharaNagisa', - name: '水原なぎさ', - profileUrl: '${path}/photos/profile.png', - info: [ - ['暱稱', '水原なぎさ'], - ['地區', '上海'], - ['出生', '2002.4.19'], - ['逝世', '2021.7.21'], - ], - websites: [ - ['twitter', 'https://twitter.com/MizuharaNagisa'], - ], -} diff --git a/people/MizuharaNagisa/page.md b/people/MizuharaNagisa/page.md index 0af6b3f7..bcb7ff05 100644 --- a/people/MizuharaNagisa/page.md +++ b/people/MizuharaNagisa/page.md @@ -1,3 +1,10 @@ +--- +name: 水原なぎさ +info: + alias: 水原なぎさ + location: 上海 +--- + ## 简介 水原渚是一名居住在上海区域的跨性别女性，蛍的好友。是活跃的维基人，曾长期编辑中文维基百科和其它 MediaWiki 站点。从2019年开始成为一名舰队收藏提督，最喜欢的舰娘是响（推测）。喜欢钻研树莓派等电脑硬件技术，也热爱绘画。可以熟练使用日文。 diff --git a/people/SevenBird/info.json5 b/people/SevenBird/info.json5 index 973ec5c0..1409952d 100644 --- a/people/SevenBird/info.json5 +++ b/people/SevenBird/info.json5 @@ -1,14 +1,11 @@ { id: 'SevenBird', - name: '柒鸟', profileUrl: '${path}/photos/profile.jpg', - info: [ - ['昵称', '柒鸟'], - ['地区', '福建'], - ['出生', '2005.2.26'], - ['逝世', '2022.8.12'], - ], + info: { + born: "2005-02-26", + died: "2022-08-12" + }, websites: [ ['twitter', 'https://twitter.com/Selrayer'], ], -} \ No newline at end of file +} diff --git a/people/SevenBird/info.zh_hant.json5 b/people/SevenBird/info.zh_hant.json5 deleted file mode 100644 index 1f6bb2d3..00000000 --- a/people/SevenBird/info.zh_hant.json5 +++ /dev/null @@ -1,14 +0,0 @@ -{ - id: 'SevenBird', - name: '柒鳥', - profileUrl: '${path}/photos/profile.jpg', - info: [ - ['暱稱', '柒鳥'], - ['地區', '福建'], - ['出生', '2005.2.26'], - ['逝世', '2022.8.12'], - ], - websites: [ - ['twitter', 'https://twitter.com/Selrayer'], - ], -} \ No newline at end of file diff --git a/people/SevenBird/page.md b/people/SevenBird/page.md index 537478b6..614ca9fc 100644 --- a/people/SevenBird/page.md +++ b/people/SevenBird/page.md @@ -1,3 +1,10 @@ +--- +name: 柒鸟 +info: + alias: 柒鸟 + location: 福建 +--- + >「想念我的时候，就抬头看看月亮吧~」 >「我会在月亮上等你」 diff --git a/people/Uekawakuyuurei/info.json5 b/people/Uekawakuyuurei/info.json5 index 467096a4..e2d5c114 100644 --- a/people/Uekawakuyuurei/info.json5 +++ b/people/Uekawakuyuurei/info.json5 @@ -1,15 +1,12 @@ { id: 'Uekawakuyuurei', - name: '蛍', profileUrl: '${path}/photos/profile.jpg', - info: [ - ['昵称', '阿蛍、蛍酱、秋雲'], - ['地区', '中国'], - ['出生', '2000.12.4'], - ['逝世', '2021.9.7'], - ], + info: { + born: "2000-12-04", + died: "2021-09-07" + }, websites: [ ['twitter', 'https://twitter.com/Uekawakuyuurei'], ['telegram', 'https://t.me/joinchat/65vSQ6ELb3YxN2I9'], ], -} \ No newline at end of file +} diff --git a/people/Uekawakuyuurei/info.zh_hant.json5 b/people/Uekawakuyuurei/info.zh_hant.json5 deleted file mode 100644 index 7e87548d..00000000 --- a/people/Uekawakuyuurei/info.zh_hant.json5 +++ /dev/null @@ -1,15 +0,0 @@ -{ - id: 'Uekawakuyuurei', - name: '蛍', - profileUrl: '${path}/photos/profile.jpg', - info: [ - ['暱稱', '阿蛍、蛍醬、秋雲'], - ['地區', '中國'], - ['出生', '2000.12.4'], - ['逝世', '2021.9.7'], - ], - websites: [ - ['twitter', 'https://twitter.com/Uekawakuyuurei'], - ['telegram', 'https://t.me/joinchat/65vSQ6ELb3YxN2I9'], - ], -} \ No newline at end of file diff --git a/people/Uekawakuyuurei/page.md b/people/Uekawakuyuurei/page.md index 8bbbb343..837d46b6 100644 --- a/people/Uekawakuyuurei/page.md +++ b/people/Uekawakuyuurei/page.md @@ -1,3 +1,10 @@ +--- +name: 蛍 +info: + alias: 阿蛍、蛍酱、秋雲 + location: 中国 +--- + ## 简介 据阿蛍的[自述](https://twitter.com/Uekawakuyuurei/status/1416208961339019267)，ta「在现实中只是一个看起来不太健康的男生而已」，不过，在网上被当成是女生的时候，ta 也不会去主动修正别人的称呼。虽然这样做 ta 会因此感到抱歉，觉得「总有一点像在骗人」，但无论阿蛍是男生还是女生，ta 都是最善良、最可爱的孩子。 diff --git a/people/donotexist_A/info.json5 b/people/donotexist_A/info.json5 index 7039cc41..32937496 100644 --- a/people/donotexist_A/info.json5 +++ b/people/donotexist_A/info.json5 @@ -1,14 +1,11 @@ { id: 'donotexist_A', - name: '不存在', profileUrl: '${path}/photos/profile.jpg', - info: [ - ['昵称', '不存在、存存'], - ['地区', '中国广东省'], - ['出生', '2002.5.7'], - ['逝世', '2021.5.13'], - ], + info: { + born: "2002-05-07", + died: "2021-05-13" + }, websites: [ ['twitter', 'https://twitter.com/donotexist_A'], ], -} \ No newline at end of file +} diff --git a/people/donotexist_A/info.zh_hant.json5 b/people/donotexist_A/info.zh_hant.json5 deleted file mode 100644 index 5162b461..00000000 --- a/people/donotexist_A/info.zh_hant.json5 +++ /dev/null @@ -1,14 +0,0 @@ -{ - id: 'donotexist_A', - name: '不存在', - profileUrl: '${path}/photos/profile.jpg', - info: [ - ['暱稱', '不存在、存存'], - ['地區', '中國廣東省'], - ['出生', '2002.5.7'], - ['逝世', '2021.5.13'], - ], - websites: [ - ['twitter', 'https://twitter.com/donotexist_A'], - ], -} \ No newline at end of file diff --git a/people/donotexist_A/page.md b/people/donotexist_A/page.md index 8cd676a7..89b8bcb5 100644 --- a/people/donotexist_A/page.md +++ b/people/donotexist_A/page.md @@ -1,3 +1,10 @@ +--- +name: 不存在 +info: + alias: 不存在、存存 + location: 中國廣東省 +--- + ## 简介 存存是一个可爱的小姑娘，因此人缘也超级好，每一个见到存存的人都会被她的热情和开朗所打动。虽然存存患有双相以及其他的基础疾病，身体不是很好，经常生病[住院](https://twitter.com/donotexist_A/status/1383379769903910915?s=20)，要吃很多药，但她和医生、病友的关系总是很好。同病房的美术生哥哥帮存存画过一张自画像。 diff --git a/people/gaoyanger/info.json5 b/people/gaoyanger/info.json5 index 8976d470..881481ab 100644 --- a/people/gaoyanger/info.json5 +++ b/people/gaoyanger/info.json5 @@ -1,15 +1,12 @@ { id: 'gaoyanger', - name: '羔羊', profileUrl: '${path}/photos/profile.jpg', - info: [ - ['昵称', '羔羊'], - ['地区', '海南海口'], - ['出生', '2002.4.12'], - ['逝世', '2020.8.27'], - ], + info: { + born: "2002-04-12", + died: "2020-08-27", + }, websites: [ ['twitter', 'https://twitter.com/gaoyanger'], ['zhihu', 'https://www.zhihu.com/people/chen-ru-32-42'], ], -} \ No newline at end of file +} diff --git a/people/gaoyanger/info.zh_hant.json5 b/people/gaoyanger/info.zh_hant.json5 deleted file mode 100644 index 04f2393a..00000000 --- a/people/gaoyanger/info.zh_hant.json5 +++ /dev/null @@ -1,15 +0,0 @@ -{ - id: 'gaoyanger', - name: '羔羊', - profileUrl: '${path}/photos/profile.jpg', - info: [ - ['暱稱', '羔羊'], - ['地區', '海南海口'], - ['出生', '2002.4.12'], - ['逝世', '2020.8.27'], - ], - websites: [ - ['twitter', 'https://twitter.com/gaoyanger'], - ['zhihu', 'https://www.zhihu.com/people/chen-ru-32-42'], - ], -} \ No newline at end of file diff --git a/people/gaoyanger/page.md b/people/gaoyanger/page.md index c479c36e..41a1ef35 100644 --- a/people/gaoyanger/page.md +++ b/people/gaoyanger/page.md @@ -1,3 +1,10 @@ +--- +name: 羔羊 +info: + alias: 羔羊 + location: 海南海口 +--- + ## 简介 羔羊是一个可爱、温柔、善良的女孩。是单亲家庭，从小生活条件不好，但她一直很坚强。 diff --git a/people/noname/info.json5 b/people/noname/info.json5 index 26ff564a..755358ff 100644 --- a/people/noname/info.json5 +++ b/people/noname/info.json5 @@ -1,14 +1,7 @@ { id: 'noname', - name: '无名逝者', profileUrl: '${path}/photos/profile.png', - info: [ - ['昵称', '无名逝者'], - ['地区', '-'], - ['出生', '-'], - ['逝世', '-'], - ], websites: [ ['one-among-us', 'https://one-among.us'], ], -} \ No newline at end of file +} diff --git a/people/noname/info.zh_hant.json5 b/people/noname/info.zh_hant.json5 deleted file mode 100644 index 8dacc5c2..00000000 --- a/people/noname/info.zh_hant.json5 +++ /dev/null @@ -1,14 +0,0 @@ -{ - id: 'noname', - name: '無名逝者', - profileUrl: '${path}/photos/profile.png', - info: [ - ['暱稱', '無名逝者'], - ['地區', '-'], - ['出生', '-'], - ['逝世', '-'], - ], - websites: [ - ['one-among-us', 'https://one-among.us'], - ], -} \ No newline at end of file diff --git a/people/noname/page.md b/people/noname/page.md index b2e9561d..82c229f9 100644 --- a/people/noname/page.md +++ b/people/noname/page.md @@ -1,3 +1,9 @@ +--- +name: 无名逝者 +info: + alias: 无名逝者 +--- + ## 简介 这个页面用来记录那些没有名字的，因为对跨性别的系统性暴力而丧失生命的受害者。ta 们或许甚至未必是跨性别本身。 From dacf47e2d848513235bda0af91c15e1b18e7cc97 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Fri, 2 Dec 2022 19:21:27 -0500 Subject: [PATCH 2/8] [O] New format --- people/homoyamakaze/info.json5 | 26 +++++++++++--------------- people/homoyamakaze/info.zh_hant.json5 | 15 --------------- people/homoyamakaze/page.md | 13 +++++++++++-- people/lintong/info.json5 | 13 +++++-------- people/lintong/info.zh_hant.json5 | 14 -------------- people/lintong/page.md | 7 +++++++ 6 files changed, 34 insertions(+), 54 deletions(-) delete mode 100644 people/homoyamakaze/info.zh_hant.json5 delete mode 100644 people/lintong/info.zh_hant.json5 diff --git a/people/homoyamakaze/info.json5 b/people/homoyamakaze/info.json5 index 8aed6fcd..8032a60c 100644 --- a/people/homoyamakaze/info.json5 +++ b/people/homoyamakaze/info.json5 @@ -1,15 +1,11 @@ -{ - id: 'homoyamakaze', - name: '浅羽猫头', - profileUrl: '${path}/photos/profile.jpg', - info: [ - ['昵称', '浅羽猫头'], - ['曾用名', '穗也猫猫头'], - ['地区', '甘肃兰州'], - ['出生', '1999.11.3'], - ['逝世', '2022.11.9'], - ], - websites: [ - ['twitter', 'https://twitter.com/homoyamakaze'], - ], - } +{ + id: 'homoyamakaze', + profileUrl: '${path}/photos/profile.jpg', + info: { + born: "1999-11-03", + died: "2022-11-09" + }, + websites: [ + ['twitter', 'https://twitter.com/homoyamakaze'], + ], +} diff --git a/people/homoyamakaze/info.zh_hant.json5 b/people/homoyamakaze/info.zh_hant.json5 deleted file mode 100644 index 2e9e8c78..00000000 --- a/people/homoyamakaze/info.zh_hant.json5 +++ /dev/null @@ -1,15 +0,0 @@ -{ - id: 'homoyamakaze', - name: '淺羽貓頭', - profileUrl: '${path}/photos/profile.jpg', - info: [ - ['昵稱', '淺羽貓頭'], - ['曾用名', '穗也貓貓頭'], - ['地區', '甘肅蘭州'], - ['出生', '1999.11.3'], - ['逝世', '2022.11.9'], - ], - websites: [ - ['twitter', 'https://twitter.com/homoyamakaze'], - ], - } diff --git a/people/homoyamakaze/page.md b/people/homoyamakaze/page.md index d5124b4d..ca2ed758 100644 --- a/people/homoyamakaze/page.md +++ b/people/homoyamakaze/page.md @@ -1,12 +1,21 @@ +--- +name: 浅羽猫头 +info: + alias: 浅羽猫头、穗也猫猫头 + location: 甘肃兰州 +--- + ## 简介 [浅羽猫头](https://twitter.com/homoyamakaze) ，上传了wiki上唯一一个辽宁地区开证方法，线下协助多名跨性别开具证明和处方，帮助很多人买到了低价日雌，数量至少在100盒以上。 - + + 2022 年 11 月 9 日晚，因网络暴力导致双相发作于家中逝世，信息准确性由她女朋友[穗也柚子](https://twitter.com/YuzuTvT)确认，有公安现场笔录录音。 - + + 该消息于 2022 年 11 月 25 日由 [穗也柚子](https://twitter.com/YuzuTvT) 和 [Lee](https://twitter.com/rbqwansui) 发布。 diff --git a/people/lintong/info.json5 b/people/lintong/info.json5 index 4dd265cf..9ad1b8f3 100644 --- a/people/lintong/info.json5 +++ b/people/lintong/info.json5 @@ -1,14 +1,11 @@ { id: 'lintong', - name: '林童', profileUrl: '${path}/photos/profile.jpg', - info: [ - ['昵称', '林童'], - ['地区', '湖北武汉'], - ['出生', '2000.06.01'], - ['逝世', '2022.06.06'], - ], + info: { + born: "2000.06.01", + died: "2022.06.06" + }, websites: [ ['QQ', 'https://304915994.qzone.qq.com/'], ], -} \ No newline at end of file +} diff --git a/people/lintong/info.zh_hant.json5 b/people/lintong/info.zh_hant.json5 deleted file mode 100644 index d899b057..00000000 --- a/people/lintong/info.zh_hant.json5 +++ /dev/null @@ -1,14 +0,0 @@ -{ - id: 'lintong', - name: '林童', - profileUrl: '${path}/photos/profile.jpg', - info: [ - ['暱稱', '林童'], - ['地區', '湖北武漢'], - ['出生', '2000-06-01'], - ['逝世', '2022-06-06'], - ], - websites: [ - ['QQ', 'https://304915994.qzone.qq.com/'], - ], -} \ No newline at end of file diff --git a/people/lintong/page.md b/people/lintong/page.md index 3cf3c43a..9e102691 100644 --- a/people/lintong/page.md +++ b/people/lintong/page.md @@ -1,3 +1,10 @@ +--- +name: 林童 +info: + alias: 林童 + location: 湖北武汉 +--- + ## 简介 林童，是一个占有欲比较强烈的女孩子，有个不经常联系的妈妈，喜欢吃西红柿炒鸡蛋什么的，喝黑色魔爪，粘人，性格方面，比较突出的就是喜欢逼着你干不喜欢的事情，有点公主病？可能是因为我吧。比较喜欢麻烦爱人。不喜欢麻烦熟人。(生前爱人留) From 09ba8d2f0f65b0e60215c16db2b88092b5c42720 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Fri, 2 Dec 2022 19:39:21 -0500 Subject: [PATCH 3/8] [U] Generate zh_hant --- people/GLaDOSister/page.zh_hant.md | 7 +++++++ people/MioCardMeow/page.zh_hant.md | 7 +++++++ people/MizuharaNagisa/page.zh_hant.md | 7 +++++++ people/SevenBird/page.zh_hant.md | 7 +++++++ people/Uekawakuyuurei/page.zh_hant.md | 7 +++++++ people/donotexist_A/page.zh_hant.md | 7 +++++++ people/gaoyanger/page.zh_hant.md | 7 +++++++ people/homoyamakaze/page.zh_hant.md | 7 +++++++ people/lintong/page.zh_hant.md | 7 +++++++ people/noname/page.zh_hant.md | 6 ++++++ scripts/.convert_past/last-hash.txt | 2 +- scripts/convert_zh.py | 12 +++++++++--- 12 files changed, 79 insertions(+), 4 deletions(-) diff --git a/people/GLaDOSister/page.zh_hant.md b/people/GLaDOSister/page.zh_hant.md index 8afe587e..ba038d62 100644 --- a/people/GLaDOSister/page.zh_hant.md +++ b/people/GLaDOSister/page.zh_hant.md @@ -1,3 +1,10 @@ +--- +name: 倉山靜葉 +info: + alias: 靜葉、G姐 + location: 中國北京 +--- + ## 簡介 正如她的簽名所寫，靜葉是「一隻可愛的語言學女孩」。 diff --git a/people/MioCardMeow/page.zh_hant.md b/people/MioCardMeow/page.zh_hant.md index 9cb5ffd3..547463a4 100644 --- a/people/MioCardMeow/page.zh_hant.md +++ b/people/MioCardMeow/page.zh_hant.md @@ -1,3 +1,10 @@ +--- +name: 澪卡喵 +info: + alias: 澪卡喵 + location: 中國 +--- + ## 簡介 [澪卡喵](https://twitter.com/MiocardMeow) ，一名跨性別女性，於 2022 年 1 月 31 日凌晨醫治無效逝世。該消息於 2022 年 2 月 14 日由 [喵小白](https://twitter.com/pizyj/status/1492928433172582400?s=21) 發佈。 diff --git a/people/MizuharaNagisa/page.zh_hant.md b/people/MizuharaNagisa/page.zh_hant.md index 3d022c93..1f4a4707 100644 --- a/people/MizuharaNagisa/page.zh_hant.md +++ b/people/MizuharaNagisa/page.zh_hant.md @@ -1,3 +1,10 @@ +--- +name: 水原なぎさ +info: + alias: 水原なぎさ + location: 上海 +--- + ## 簡介 水原渚是一名居住在上海區域的跨性別女性，蛍的好友。是活躍的維基人，曾長期編輯中文維基百科和其它 MediaWiki 站點。從2019年開始成爲一名艦隊收藏提督，最喜歡的艦娘是響（推測）。喜歡鑽研樹莓派等電腦硬件技術，也熱愛繪畫。可以熟練使用日文。 diff --git a/people/SevenBird/page.zh_hant.md b/people/SevenBird/page.zh_hant.md index 4a9f2f68..a069b1d3 100644 --- a/people/SevenBird/page.zh_hant.md +++ b/people/SevenBird/page.zh_hant.md @@ -1,3 +1,10 @@ +--- +name: 柒鳥 +info: + alias: 柒鳥 + location: 福建 +--- + >「想念我的時候，就擡頭看看月亮吧~」 >「我會在月亮上等你」 diff --git a/people/Uekawakuyuurei/page.zh_hant.md b/people/Uekawakuyuurei/page.zh_hant.md index 0233fc16..f06ac633 100644 --- a/people/Uekawakuyuurei/page.zh_hant.md +++ b/people/Uekawakuyuurei/page.zh_hant.md @@ -1,3 +1,10 @@ +--- +name: 蛍 +info: + alias: 阿蛍、蛍醬、秋雲 + location: 中國 +--- + ## 簡介 據阿蛍的[自述](https://twitter.com/Uekawakuyuurei/status/1416208961339019267)，ta「在現實中只是一個看起來不太健康的男生而已」，不過，在網上被當成是女生的時候，ta 也不會去主動修正別人的稱呼。雖然這樣做 ta 會因此感到抱歉，覺得「總有一點像在騙人」，但無論阿蛍是男生還是女生，ta 都是最善良、最可愛的孩子。 diff --git a/people/donotexist_A/page.zh_hant.md b/people/donotexist_A/page.zh_hant.md index f9905261..02fdec89 100644 --- a/people/donotexist_A/page.zh_hant.md +++ b/people/donotexist_A/page.zh_hant.md @@ -1,3 +1,10 @@ +--- +name: 不存在 +info: + alias: 不存在、存存 + location: 中國廣東省 +--- + ## 簡介 存存是一個可愛的小姑娘，因此人緣也超級好，每一個見到存存的人都會被她的熱情和開朗所打動。雖然存存患有雙相以及其他的基礎疾病，身體不是很好，經常生病[住院](https://twitter.com/donotexist_A/status/1383379769903910915?s=20)，要喫很多藥，但她和醫生、病友的關係總是很好。同病房的美術生哥哥幫存存畫過一張自畫像。 diff --git a/people/gaoyanger/page.zh_hant.md b/people/gaoyanger/page.zh_hant.md index 58bb7f37..7d2c951f 100644 --- a/people/gaoyanger/page.zh_hant.md +++ b/people/gaoyanger/page.zh_hant.md @@ -1,3 +1,10 @@ +--- +name: 羔羊 +info: + alias: 羔羊 + location: 海南海口 +--- + ## 簡介 羔羊是一個可愛、溫柔、善良的女孩。是單親家庭，從小生活條件不好，但她一直很堅強。 diff --git a/people/homoyamakaze/page.zh_hant.md b/people/homoyamakaze/page.zh_hant.md index acd3c418..68c21707 100644 --- a/people/homoyamakaze/page.zh_hant.md +++ b/people/homoyamakaze/page.zh_hant.md @@ -1,3 +1,10 @@ +--- +name: 淺羽貓頭 +info: + alias: 淺羽貓頭、穗也貓貓頭 + location: 甘肅蘭州 +--- + ## 简介 [淺羽貓頭](https://twitter.com/homoyamakaze) ，上傳了wiki上唯一一個遼寧地區開證方法，線下協助多名跨性別開具證明和處方，説明很多人買到了低價日雌，數量至少在100盒以上。 diff --git a/people/lintong/page.zh_hant.md b/people/lintong/page.zh_hant.md index 0f527b7d..41498431 100644 --- a/people/lintong/page.zh_hant.md +++ b/people/lintong/page.zh_hant.md @@ -1,3 +1,10 @@ +--- +name: 林童 +info: + alias: 林童 + location: 湖北武漢 +--- + ## 簡介 林童，是一個佔有欲比較強烈的女孩子，有個不經常聯繫的媽媽，喜歡吃西紅柿炒雞蛋什麽的，喝黑色魔爪，黏人，性格方面，比較突出的就是喜歡逼著妳幹不喜歡的事情，有點公主病？可能是因為我吧。比較喜歡麻煩愛人。不喜歡麻煩熟人。(生前愛人留) diff --git a/people/noname/page.zh_hant.md b/people/noname/page.zh_hant.md index 806310f3..d9d59fc5 100644 --- a/people/noname/page.zh_hant.md +++ b/people/noname/page.zh_hant.md @@ -1,3 +1,9 @@ +--- +name: 無名逝者 +info: + alias: 無名逝者 +--- + ## 簡介 這個頁面用來記錄那些沒有名字的，因爲對跨性別的系統性暴力而喪失生命的受害者。ta 們或許甚至未必是跨性別本身。 diff --git a/scripts/.convert_past/last-hash.txt b/scripts/.convert_past/last-hash.txt index 661d5fdc..0c763966 100644 --- a/scripts/.convert_past/last-hash.txt +++ b/scripts/.convert_past/last-hash.txt @@ -1 +1 @@ -bb82193d413000569b581dbeacfff2017988f49a +dacf47e2d848513235bda0af91c15e1b18e7cc97 diff --git a/scripts/convert_zh.py b/scripts/convert_zh.py index 77cdbe71..3c7066ff 100755 --- a/scripts/convert_zh.py +++ b/scripts/convert_zh.py @@ -2,14 +2,14 @@ import difflib import os from pathlib import Path -from subprocess import check_output +from subprocess import check_output, CalledProcessError import opencc from hypy_utils import write from hypy_utils.tqdm_utils import pmap, smap ALLOWED_DIRS = {Path(p) for p in ['people', 'src/assets']} -ALLOWED_SUF = {'.json5', '.md'} +ALLOWED_SUF = {'.md'} HANS_TO_HANT = opencc.OpenCC('s2t.json') @@ -122,7 +122,13 @@ def process_file(f: Path): # Hant file exists, use diff # Obtain original version from git - past = check_output(['git', 'show', f"{LAST_HASH}:{f.relative_to('.')}"]).decode() + try: + past = check_output(['git', 'show', f"{LAST_HASH}:{f.relative_to('.')}"]).decode() + except CalledProcessError as e: + # This might happen when the last recorded commit is before the first occurrence of the file. If this + # happens, print an error. + print(e) + return # Nothing changed, skip if past == hans: From 3bed21c6664ff790c6fdaafa61ba80e447d166d8 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Fri, 2 Dec 2022 20:43:14 -0500 Subject: [PATCH 4/8] [+] Compile to the old format --- package.json | 5 +++ scripts/build.ts | 83 +++++++++++++++++++++++++++++++++++++----------- yarn.lock | 55 ++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 7c68b427..4748d311 100644 --- a/package.json +++ b/package.json @@ -18,9 +18,14 @@ "@types/node": "^18", "esbuild": "^0.15.14", "fs-extra": "^10.1.0", + "js-yaml": "^4.1.0", "json5": "^2.2.1", + "markdown-yaml-metadata-parser": "^3.0.0", "ts-node": "^10.9.1", "typescript": "^4.9.3", "xdm": "^3.4.0" + }, + "devDependencies": { + "@types/js-yaml": "^4.0.5" } } diff --git a/scripts/build.ts b/scripts/build.ts index 5a2c0b17..13a9cc13 100644 --- a/scripts/build.ts +++ b/scripts/build.ts @@ -3,6 +3,8 @@ import path from "path"; import fs from "fs-extra"; import json5 from "json5"; +import YAML from 'js-yaml'; +import metadataParser from 'markdown-yaml-metadata-parser'; import { renderMdx } from "./mdx.ts"; @@ -12,7 +14,6 @@ const PEOPLE_DIR = "people"; const COMMENTS_DIR = "comments"; const DIST_DIR = "dist"; -const DIST_PEOPLE_LIST = "people-list.json"; const projectRoot = path.dirname(path.dirname(url.fileURLToPath(import.meta.url))); const peopleDir = path.join(projectRoot, PEOPLE_DIR); @@ -26,24 +27,38 @@ const people = fs.readdirSync(peopleDir).map(person => ({ // Extract metadata from `people/${dirname}/info.json5` to `dist/people-list.json`. function buildPeopleInfoAndList() { const PEOPLE_LIST_KEYS = ["id", "name", "profileUrl"] as const; - type PeopleMeta = Record<"path" | typeof PEOPLE_LIST_KEYS[number], unknown>; - const peopleList: PeopleMeta[] = []; - for (const { dirname, srcPath, distPath } of people) { - for (const lang of ['', '.zh_hant']) { - const infoFile = fs.readFileSync(path.join(srcPath, `info${lang}.json5`), "utf-8"); + // Read internationalized key names + const infoKeys = YAML.load(fs.readFileSync('info-i18n.yml')) + + // Compile into multiple languages + for (const lang of ['', '.zh_hant']) { + + // Compiled meta of list of people for the front page (contains keys id, name, profileUrl) + const peopleList: PeopleMeta[] = []; + + // For each person + for (const { dirname, srcPath, distPath } of people) { + const infoFile = fs.readFileSync(path.join(srcPath, `info.json5`), "utf-8"); const info = json5.parse(infoFile); - // Add meta information - const peopleMeta = { - path: dirname, - ...Object.fromEntries(PEOPLE_LIST_KEYS.map(key => [key, info[key]])) - } as PeopleMeta; + // Read the page.md of that language + const markdown = fs.readFileSync(path.join(srcPath, `page${lang}.md`), "utf-8"); - // Avoid duplicates - if (peopleList.filter(it => it.id == peopleMeta.id).length == 0) - peopleList.push(peopleMeta); + // Get the markdown header + const mdMeta = metadataParser(markdown).metadata + info.name = mdMeta.name + + // Convert info dict to [[key, value], ...] + // And add info k-v pairs from markdown to the info object in json5 + info.info = [...Object.entries(mdMeta.info ?? {}), ...Object.entries(info.info ?? {})] + + // Convert key names to internationalized key names + let langKey = indexTrim(lang, ".") + if (langKey == '') langKey = "zh_hans" + const keys = infoKeys[langKey]['key'] + info.info = info.info.map(pair => [pair[0] in keys ? keys[pair[0]] : pair[0], pair[1]]) // Combine comments in people/${dirname}/comments/${cf}.json const commentPath = path.join(srcPath, COMMENTS_DIR) @@ -55,11 +70,21 @@ function buildPeopleInfoAndList() { // Write info.json fs.ensureDirSync(distPath); fs.writeFileSync(path.join(distPath, `info${lang}.json`), JSON.stringify(info)); - } - } - // Write people-list.json - fs.writeFileSync(path.join(projectRoot, DIST_DIR, DIST_PEOPLE_LIST), JSON.stringify(peopleList)); + // Create people list meta information + const peopleMeta = { + path: dirname, + ...Object.fromEntries(PEOPLE_LIST_KEYS.map(key => [key, info[key]])) + } as PeopleMeta; + + // Add meta to people list + if (peopleList.filter(it => it.id == peopleMeta.id).length == 0) + peopleList.push(peopleMeta); + } + + // Write people-list.json + fs.writeFileSync(path.join(projectRoot, DIST_DIR, `people-list${lang}.json`), JSON.stringify(peopleList)); + } } // Render `people/${dirname}/page.md` to `dist/people/${dirname}/page.js`. @@ -67,7 +92,8 @@ function buildPeoplePages() { for (const { srcPath, distPath } of people) { for (const lang of ['', '.zh_hant']) { - const markdown = fs.readFileSync(path.join(srcPath, `page${lang}.md`), "utf-8"); + // Read markdown page and remove markdown meta + const markdown = metadataParser(fs.readFileSync(path.join(srcPath, `page${lang}.md`), "utf-8")).content; const result = renderMdx(markdown); fs.ensureDirSync(distPath); @@ -101,3 +127,22 @@ buildPeopleInfoAndList(); buildPeoplePages(); copyPeopleAssets(); copyPublic(); + +/** + * Trim a specific char from a string + * + * @param str String + * @param ch Character (must have len 1) + */ +function indexTrim(str: string, ch: string) { + let start = 0 + let end = str.length + + while (start < end && str[start] === ch) + ++start; + + while (end > start && str[end - 1] === ch) + --end; + + return (start > 0 || end < str.length) ? str.substring(start, end) : str; +} diff --git a/yarn.lock b/yarn.lock index e761e643..7b8d1b83 100644 --- a/yarn.lock +++ b/yarn.lock @@ -201,6 +201,11 @@ dependencies: "@types/unist" "*" +"@types/js-yaml@^4.0.5": + version "4.0.5" + resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.5.tgz#738dd390a6ecc5442f35e7f03fa1431353f7e138" + integrity sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA== + "@types/mdast@^3.0.0": version "3.0.10" resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af" @@ -248,6 +253,18 @@ arg@^4.1.0: resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + astring@^1.6.0, astring@^1.8.0: version "1.8.3" resolved "https://registry.yarnpkg.com/astring/-/astring-1.8.3.tgz#1a0ae738c7cc558f8e5ddc8e3120636f5cebcb85" @@ -332,6 +349,11 @@ dequal@^2.0.0: resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be" integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA== +detect-newline@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" + integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== + diff@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" @@ -470,6 +492,11 @@ esbuild@^0.15.14: esbuild-windows-64 "0.15.14" esbuild-windows-arm64 "0.15.14" +esprima@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + estree-util-attach-comments@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/estree-util-attach-comments/-/estree-util-attach-comments-2.1.0.tgz#47d69900588bcbc6bf58c3798803ec5f1f3008de" @@ -628,6 +655,21 @@ is-reference@^3.0.0: dependencies: "@types/estree" "*" +js-yaml@^3.14.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +js-yaml@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + json5@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" @@ -662,6 +704,14 @@ markdown-extensions@^1.0.0: resolved "https://registry.yarnpkg.com/markdown-extensions/-/markdown-extensions-1.1.1.tgz#fea03b539faeaee9b4ef02a3769b455b189f7fc3" integrity sha512-WWC0ZuMzCyDHYCasEGs4IPvLyTGftYwh6wIEOULOF0HXcqZlhwRzrK0w2VUlxWA98xnvb/jszw4ZSkJ6ADpM6Q== +markdown-yaml-metadata-parser@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/markdown-yaml-metadata-parser/-/markdown-yaml-metadata-parser-3.0.0.tgz#648ce68850453bfc18aa365879350548edc26e38" + integrity sha512-gRxEfuGIpb9pS1nQyASx3+l99e1hyTaK/+zDuvGcZJvr+OlksZ5O+q7opPcQP25j/z7NoOYEp17Lxgq5Sn4vDg== + dependencies: + detect-newline "^3.1.0" + js-yaml "^3.14.1" + mdast-util-definitions@^5.0.0: version "5.1.1" resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-5.1.1.tgz#2c1d684b28e53f84938bb06317944bee8efa79db" @@ -1159,6 +1209,11 @@ space-separated-tokens@^2.0.0: resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz#1ecd9d2350a3844572c3f4a312bceb018348859f" integrity sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q== +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== + stringify-entities@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-4.0.3.tgz#cfabd7039d22ad30f3cc435b0ca2c1574fc88ef8" From bfd7065c0ea453175ffd2a2644a4c859eab480d5 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Fri, 2 Dec 2022 20:59:51 -0500 Subject: [PATCH 5/8] [O] Use yaml instead of json5 --- package.json | 1 - people/GLaDOSister/info.json5 | 11 ----------- people/GLaDOSister/info.yml | 7 +++++++ people/MioCardMeow/info.json5 | 11 ----------- people/MioCardMeow/info.yml | 7 +++++++ people/MizuharaNagisa/info.json5 | 11 ----------- people/MizuharaNagisa/info.yml | 7 +++++++ people/SevenBird/info.json5 | 11 ----------- people/SevenBird/info.yml | 7 +++++++ people/Uekawakuyuurei/info.json5 | 12 ------------ people/Uekawakuyuurei/info.yml | 8 ++++++++ people/donotexist_A/info.json5 | 11 ----------- people/donotexist_A/info.yml | 7 +++++++ people/gaoyanger/info.json5 | 12 ------------ people/gaoyanger/info.yml | 8 ++++++++ people/homoyamakaze/info.json5 | 11 ----------- people/homoyamakaze/info.yml | 7 +++++++ people/lintong/info.json5 | 11 ----------- people/lintong/info.yml | 7 +++++++ people/noname/info.json5 | 7 ------- people/noname/info.yml | 4 ++++ scripts/build.ts | 8 +++++--- yarn.lock | 5 ----- 23 files changed, 74 insertions(+), 117 deletions(-) delete mode 100644 people/GLaDOSister/info.json5 create mode 100644 people/GLaDOSister/info.yml delete mode 100644 people/MioCardMeow/info.json5 create mode 100644 people/MioCardMeow/info.yml delete mode 100644 people/MizuharaNagisa/info.json5 create mode 100644 people/MizuharaNagisa/info.yml delete mode 100644 people/SevenBird/info.json5 create mode 100644 people/SevenBird/info.yml delete mode 100644 people/Uekawakuyuurei/info.json5 create mode 100644 people/Uekawakuyuurei/info.yml delete mode 100644 people/donotexist_A/info.json5 create mode 100644 people/donotexist_A/info.yml delete mode 100644 people/gaoyanger/info.json5 create mode 100644 people/gaoyanger/info.yml delete mode 100644 people/homoyamakaze/info.json5 create mode 100644 people/homoyamakaze/info.yml delete mode 100644 people/lintong/info.json5 create mode 100644 people/lintong/info.yml delete mode 100644 people/noname/info.json5 create mode 100644 people/noname/info.yml diff --git a/package.json b/package.json index 4748d311..09a7c63e 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ "esbuild": "^0.15.14", "fs-extra": "^10.1.0", "js-yaml": "^4.1.0", - "json5": "^2.2.1", "markdown-yaml-metadata-parser": "^3.0.0", "ts-node": "^10.9.1", "typescript": "^4.9.3", diff --git a/people/GLaDOSister/info.json5 b/people/GLaDOSister/info.json5 deleted file mode 100644 index ad0d9738..00000000 --- a/people/GLaDOSister/info.json5 +++ /dev/null @@ -1,11 +0,0 @@ -{ - id: 'GLaDOSister', - profileUrl: '${path}/photos/profile.jpg', - info: { - born: "1997-01-13", - died: "2019-12-03" - }, - websites: [ - ['zhihu', 'https://www.zhihu.com/people/gmjyxx'], - ], -} diff --git a/people/GLaDOSister/info.yml b/people/GLaDOSister/info.yml new file mode 100644 index 00000000..f00d8acf --- /dev/null +++ b/people/GLaDOSister/info.yml @@ -0,0 +1,7 @@ +id: GLaDOSister +profileUrl: ${path}/photos/profile.jpg +info: + born: '1997-01-13' + died: '2019-12-03' +websites: + zhihu: https://www.zhihu.com/people/gmjyxx diff --git a/people/MioCardMeow/info.json5 b/people/MioCardMeow/info.json5 deleted file mode 100644 index 9d6c877a..00000000 --- a/people/MioCardMeow/info.json5 +++ /dev/null @@ -1,11 +0,0 @@ -{ - id: 'MioCardMeow', - profileUrl: '${path}/photos/profile.jpg', - info: { - born: "2005-04-02", - died: "2022-01-31" - }, - websites: [ - ['twitter', 'https://twitter.com/MiocardMeow'], - ], -} diff --git a/people/MioCardMeow/info.yml b/people/MioCardMeow/info.yml new file mode 100644 index 00000000..951b8ee3 --- /dev/null +++ b/people/MioCardMeow/info.yml @@ -0,0 +1,7 @@ +id: MioCardMeow +profileUrl: ${path}/photos/profile.jpg +info: + born: '2005-04-02' + died: '2022-01-31' +websites: + twitter: https://twitter.com/MiocardMeow diff --git a/people/MizuharaNagisa/info.json5 b/people/MizuharaNagisa/info.json5 deleted file mode 100644 index f42a0f09..00000000 --- a/people/MizuharaNagisa/info.json5 +++ /dev/null @@ -1,11 +0,0 @@ -{ - id: 'MizuharaNagisa', - profileUrl: '${path}/photos/profile.png', - info: { - born: "2002-04-19", - died: "2021-07-21" - }, - websites: [ - ['twitter', 'https://twitter.com/MizuharaNagisa'], - ], -} diff --git a/people/MizuharaNagisa/info.yml b/people/MizuharaNagisa/info.yml new file mode 100644 index 00000000..5fe8fda9 --- /dev/null +++ b/people/MizuharaNagisa/info.yml @@ -0,0 +1,7 @@ +id: MizuharaNagisa +profileUrl: ${path}/photos/profile.png +info: + born: '2002-04-19' + died: '2021-07-21' +websites: + twitter: https://twitter.com/MizuharaNagisa diff --git a/people/SevenBird/info.json5 b/people/SevenBird/info.json5 deleted file mode 100644 index 1409952d..00000000 --- a/people/SevenBird/info.json5 +++ /dev/null @@ -1,11 +0,0 @@ -{ - id: 'SevenBird', - profileUrl: '${path}/photos/profile.jpg', - info: { - born: "2005-02-26", - died: "2022-08-12" - }, - websites: [ - ['twitter', 'https://twitter.com/Selrayer'], - ], -} diff --git a/people/SevenBird/info.yml b/people/SevenBird/info.yml new file mode 100644 index 00000000..c12b1a2b --- /dev/null +++ b/people/SevenBird/info.yml @@ -0,0 +1,7 @@ +id: SevenBird +profileUrl: ${path}/photos/profile.jpg +info: + born: '2005-02-26' + died: '2022-08-12' +websites: + twitter: https://twitter.com/Selrayer diff --git a/people/Uekawakuyuurei/info.json5 b/people/Uekawakuyuurei/info.json5 deleted file mode 100644 index e2d5c114..00000000 --- a/people/Uekawakuyuurei/info.json5 +++ /dev/null @@ -1,12 +0,0 @@ -{ - id: 'Uekawakuyuurei', - profileUrl: '${path}/photos/profile.jpg', - info: { - born: "2000-12-04", - died: "2021-09-07" - }, - websites: [ - ['twitter', 'https://twitter.com/Uekawakuyuurei'], - ['telegram', 'https://t.me/joinchat/65vSQ6ELb3YxN2I9'], - ], -} diff --git a/people/Uekawakuyuurei/info.yml b/people/Uekawakuyuurei/info.yml new file mode 100644 index 00000000..536d6ef4 --- /dev/null +++ b/people/Uekawakuyuurei/info.yml @@ -0,0 +1,8 @@ +id: Uekawakuyuurei +profileUrl: ${path}/photos/profile.jpg +info: + born: '2000-12-04' + died: '2021-09-07' +websites: + twitter: https://twitter.com/Uekawakuyuurei + telegram: https://t.me/joinchat/65vSQ6ELb3YxN2I9 diff --git a/people/donotexist_A/info.json5 b/people/donotexist_A/info.json5 deleted file mode 100644 index 32937496..00000000 --- a/people/donotexist_A/info.json5 +++ /dev/null @@ -1,11 +0,0 @@ -{ - id: 'donotexist_A', - profileUrl: '${path}/photos/profile.jpg', - info: { - born: "2002-05-07", - died: "2021-05-13" - }, - websites: [ - ['twitter', 'https://twitter.com/donotexist_A'], - ], -} diff --git a/people/donotexist_A/info.yml b/people/donotexist_A/info.yml new file mode 100644 index 00000000..98d9cb38 --- /dev/null +++ b/people/donotexist_A/info.yml @@ -0,0 +1,7 @@ +id: donotexist_A +profileUrl: ${path}/photos/profile.jpg +info: + born: '2002-05-07' + died: '2021-05-13' +websites: + twitter: https://twitter.com/donotexist_A diff --git a/people/gaoyanger/info.json5 b/people/gaoyanger/info.json5 deleted file mode 100644 index 881481ab..00000000 --- a/people/gaoyanger/info.json5 +++ /dev/null @@ -1,12 +0,0 @@ -{ - id: 'gaoyanger', - profileUrl: '${path}/photos/profile.jpg', - info: { - born: "2002-04-12", - died: "2020-08-27", - }, - websites: [ - ['twitter', 'https://twitter.com/gaoyanger'], - ['zhihu', 'https://www.zhihu.com/people/chen-ru-32-42'], - ], -} diff --git a/people/gaoyanger/info.yml b/people/gaoyanger/info.yml new file mode 100644 index 00000000..bd773b9d --- /dev/null +++ b/people/gaoyanger/info.yml @@ -0,0 +1,8 @@ +id: gaoyanger +profileUrl: ${path}/photos/profile.jpg +info: + born: '2002-04-12' + died: '2020-08-27' +websites: + twitter: https://twitter.com/gaoyanger + zhihu: https://www.zhihu.com/people/chen-ru-32-42 diff --git a/people/homoyamakaze/info.json5 b/people/homoyamakaze/info.json5 deleted file mode 100644 index 8032a60c..00000000 --- a/people/homoyamakaze/info.json5 +++ /dev/null @@ -1,11 +0,0 @@ -{ - id: 'homoyamakaze', - profileUrl: '${path}/photos/profile.jpg', - info: { - born: "1999-11-03", - died: "2022-11-09" - }, - websites: [ - ['twitter', 'https://twitter.com/homoyamakaze'], - ], -} diff --git a/people/homoyamakaze/info.yml b/people/homoyamakaze/info.yml new file mode 100644 index 00000000..f2c98090 --- /dev/null +++ b/people/homoyamakaze/info.yml @@ -0,0 +1,7 @@ +id: homoyamakaze +profileUrl: ${path}/photos/profile.jpg +info: + born: '1999-11-03' + died: '2022-11-09' +websites: + twitter: https://twitter.com/homoyamakaze diff --git a/people/lintong/info.json5 b/people/lintong/info.json5 deleted file mode 100644 index 9ad1b8f3..00000000 --- a/people/lintong/info.json5 +++ /dev/null @@ -1,11 +0,0 @@ -{ - id: 'lintong', - profileUrl: '${path}/photos/profile.jpg', - info: { - born: "2000.06.01", - died: "2022.06.06" - }, - websites: [ - ['QQ', 'https://304915994.qzone.qq.com/'], - ], -} diff --git a/people/lintong/info.yml b/people/lintong/info.yml new file mode 100644 index 00000000..06ca9775 --- /dev/null +++ b/people/lintong/info.yml @@ -0,0 +1,7 @@ +id: lintong +profileUrl: ${path}/photos/profile.jpg +info: + born: 2000.06.01 + died: 2022.06.06 +websites: + QQ: https://304915994.qzone.qq.com/ diff --git a/people/noname/info.json5 b/people/noname/info.json5 deleted file mode 100644 index 755358ff..00000000 --- a/people/noname/info.json5 +++ /dev/null @@ -1,7 +0,0 @@ -{ - id: 'noname', - profileUrl: '${path}/photos/profile.png', - websites: [ - ['one-among-us', 'https://one-among.us'], - ], -} diff --git a/people/noname/info.yml b/people/noname/info.yml new file mode 100644 index 00000000..064df98d --- /dev/null +++ b/people/noname/info.yml @@ -0,0 +1,4 @@ +id: noname +profileUrl: ${path}/photos/profile.png +websites: + one-among-us: https://one-among.us diff --git a/scripts/build.ts b/scripts/build.ts index 13a9cc13..fb0c53c0 100644 --- a/scripts/build.ts +++ b/scripts/build.ts @@ -2,7 +2,6 @@ import url from "url"; import path from "path"; import fs from "fs-extra"; -import json5 from "json5"; import YAML from 'js-yaml'; import metadataParser from 'markdown-yaml-metadata-parser'; @@ -40,8 +39,8 @@ function buildPeopleInfoAndList() { // For each person for (const { dirname, srcPath, distPath } of people) { - const infoFile = fs.readFileSync(path.join(srcPath, `info.json5`), "utf-8"); - const info = json5.parse(infoFile); + const infoFile = fs.readFileSync(path.join(srcPath, `info.yml`), "utf-8"); + const info = YAML.load(infoFile); // Read the page.md of that language const markdown = fs.readFileSync(path.join(srcPath, `page${lang}.md`), "utf-8"); @@ -50,6 +49,9 @@ function buildPeopleInfoAndList() { const mdMeta = metadataParser(markdown).metadata info.name = mdMeta.name + // Convert website dict into entries [[k, v], ...] + info.websites = Object.entries(info.websites ?? {}) + // Convert info dict to [[key, value], ...] // And add info k-v pairs from markdown to the info object in json5 info.info = [...Object.entries(mdMeta.info ?? {}), ...Object.entries(info.info ?? {})] diff --git a/yarn.lock b/yarn.lock index 7b8d1b83..b4d0426e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -670,11 +670,6 @@ js-yaml@^4.1.0: dependencies: argparse "^2.0.1" -json5@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== - jsonfile@^6.0.1: version "6.1.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" From 8f826c393e75c64e393b74ccdca67330c6462e4e Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Fri, 2 Dec 2022 21:01:32 -0500 Subject: [PATCH 6/8] [U] yarn upgrade --- package.json | 2 +- yarn.lock | 370 +++++++++++++++++++++++++-------------------------- 2 files changed, 186 insertions(+), 186 deletions(-) diff --git a/package.json b/package.json index 09a7c63e..1fc665e0 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@types/fs-extra": "^9.0.13", "@types/node": "^18", "esbuild": "^0.15.14", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "js-yaml": "^4.1.0", "markdown-yaml-metadata-parser": "^3.0.0", "ts-node": "^10.9.1", diff --git a/yarn.lock b/yarn.lock index b4d0426e..7922ca57 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9,15 +9,15 @@ dependencies: "@jridgewell/trace-mapping" "0.3.9" -"@esbuild/android-arm@0.15.14": - version "0.15.14" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.14.tgz#5d0027f920eeeac313c01fd6ecb8af50c306a466" - integrity sha512-+Rb20XXxRGisNu2WmNKk+scpanb7nL5yhuI1KR9wQFiC43ddPj/V1fmNyzlFC9bKiG4mYzxW7egtoHVcynr+OA== +"@esbuild/android-arm@0.15.16": + version "0.15.16" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.16.tgz#0642926178b15e3d1545efae6eee05c4f3451d15" + integrity sha512-nyB6CH++2mSgx3GbnrJsZSxzne5K0HMyNIWafDHqYy7IwxFc4fd/CgHVZXr8Eh+Q3KbIAcAe3vGyqIPhGblvMQ== -"@esbuild/linux-loong64@0.15.14": - version "0.15.14" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.14.tgz#1221684955c44385f8af34f7240088b7dc08d19d" - integrity sha512-eQi9rosGNVQFJyJWV0HCA5WZae/qWIQME7s8/j8DMvnylfBv62Pbu+zJ2eUDqNf2O4u3WB+OEXyfkpBoe194sg== +"@esbuild/linux-loong64@0.15.16": + version "0.15.16" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.16.tgz#284522de76abe951e4ed2bd24a467e8d49c67933" + integrity sha512-SDLfP1uoB0HZ14CdVYgagllgrG7Mdxhkt4jDJOKl/MldKrkQ6vDJMZKl2+5XsEY/Lzz37fjgLQoJBGuAw/x8kQ== "@jridgewell/resolve-uri@^3.0.3": version "3.1.0" @@ -68,71 +68,71 @@ estree-walker "^2.0.1" picomatch "^2.2.2" -"@swc/core-darwin-arm64@1.3.17": - version "1.3.17" - resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.17.tgz#8692a7accdadee2059da7f824e2302a3805d577b" - integrity sha512-l82ub46GSRRpPpvR9NkHqqskPKQAkpRAKMZNzBrY01GLzUj63XH8uAv+3N1Htpq835iekWJjGZXYONCZ1eHlcQ== +"@swc/core-darwin-arm64@1.3.21": + version "1.3.21" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.21.tgz#9fe6d5c4c3ca0854194ab7d3e42ac29cda422abf" + integrity sha512-5dBrJyrCzdHOQ9evS9NBJm2geKcXffIuAvSrnwbMHkfTpl+pOM7crry2tolydFXdOE/Jbx8yyahAIXPne1fTHw== -"@swc/core-darwin-x64@1.3.17": - version "1.3.17" - resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.17.tgz#4f6490bace2569a6438eab4f66e13b2ab5b41883" - integrity sha512-pBVrF1Ac5t6v9wd5Jqdfve7d0G3ELnjHzaEmCxV0W3ma7/pfHiGv7ZPGnXTclt0+IrMisrVoY5LM+xG1Hv+91Q== +"@swc/core-darwin-x64@1.3.21": + version "1.3.21" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.21.tgz#6fb005ff27c5521534dd75732973182f45836681" + integrity sha512-CAtzfsRoVZr7DLKOOWPua6npFdj06wRuv1us275CY2QS3mg1bPl9BxA3c94q3mMcu5Bf06+dzUOjJSGrsBD7Ig== -"@swc/core-linux-arm-gnueabihf@1.3.17": - version "1.3.17" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.17.tgz#67e50a8c9bbf2c28147a6ed6b25fd3084c7e9ade" - integrity sha512-argIcltgNEssehO7PzXuNYbV7ubVd6YW13FhB9uNWEp/1HGSzIJEnJ4tISbZe9NA9jwI3IALAiE3vDdTdGf/XA== +"@swc/core-linux-arm-gnueabihf@1.3.21": + version "1.3.21" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.21.tgz#3c54f62c1718408993b82ae4726c081e3271f002" + integrity sha512-oPO7oFr89pjDFlHJ2aZvzGR6hwy5nmQyeiuqpTgfn+RFFLLbipFawJe/2NBWyD35bxuguW6a3/w9I6edKTpLUw== -"@swc/core-linux-arm64-gnu@1.3.17": - version "1.3.17" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.17.tgz#a9062b96abe79de5d3f22fb71cf836522833320e" - integrity sha512-bH0YSJd3thV1/kY5lHkeXTEcbx0HYFpIqCGJbeDvzpg38FEFSFiUw9+0VX6Yf3FKPq1DcGK/eAKYC7LeZfAzvg== +"@swc/core-linux-arm64-gnu@1.3.21": + version "1.3.21" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.21.tgz#7a4e17420ad98f35712cd2cbde46b8a78c39beb3" + integrity sha512-cgPw35T8HO4gB/tvPJMwjJuNNpydmw6U5hkxZ+7jiE+qA8hN8a71i+BBfXeSzlo60t4c44+zK4t+gK7UacZg2w== -"@swc/core-linux-arm64-musl@1.3.17": - version "1.3.17" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.17.tgz#6e520d2ed5944badcbb7b0b63b8de733e06d7bc2" - integrity sha512-sV5rfpPADmOg5YfTXLLGAzeTUjjgix29kra44EKa25Qyuwu/52OkoW4olF86qwvcQrRySWwga95EeClRhIX/zA== +"@swc/core-linux-arm64-musl@1.3.21": + version "1.3.21" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.21.tgz#2b98140cc6dcd23c28f823a8ab8d61df8f876aed" + integrity sha512-kwH+HHtcakSqR3gF5QJ7N7SPs96ilFiXuauB02Ct3UflaGbVYVoeFYj/VEIJ+ZJvlvvOEDByOiLyrk2bw0bG7A== -"@swc/core-linux-x64-gnu@1.3.17": - version "1.3.17" - resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.17.tgz#b19a221c2a6c50c360a4f4b6a0ba4f3974b62028" - integrity sha512-KbPdQSLgSjTutFsCGzjTzMCzZBiem4dEByiKxkrQmt87kLX4wLlPCy0Gppcaa6jExRcvy5co/vlf9TknuKcy4A== +"@swc/core-linux-x64-gnu@1.3.21": + version "1.3.21" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.21.tgz#6dc8105f6a6252322010896e79ad8a12269862ed" + integrity sha512-/kLQLNxwdX6kO2R751uUrxXZsAhOkA1EeQzAqj+5Y+bzt3hA5asH5evkY0w0Aj1zCofX4p4o/Q35mandUPxMlw== -"@swc/core-linux-x64-musl@1.3.17": - version "1.3.17" - resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.17.tgz#000fb3569946026c54507bfa31fd0518c47ed6f2" - integrity sha512-NDUbaJ0MbklioadPhkzQDOP8eazOn1lJmNmcmg9zNUR7GZsek1CMmJkyJ3ETXZ5gbIfVQ1hPkPm23P9vQBtCdQ== +"@swc/core-linux-x64-musl@1.3.21": + version "1.3.21" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.21.tgz#e94eeecf389b441f09cf2de712caf5c9d0a0d5da" + integrity sha512-s+l3LqUzDli6rbmIPR3IfO23IOLYBVxk97CDdcJWrRTVtCwUKFhFVJVZyErveriqLXSGJhy5+UL+aOuxC4dk8g== -"@swc/core-win32-arm64-msvc@1.3.17": - version "1.3.17" - resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.17.tgz#9d62c0778e293f0090b043cd9886de6eaf8d7f1c" - integrity sha512-fmpGG1iuKcMSDSO2ZHETlYTRel5hTwyuJ4AYbUX3/YzAE4iEnV1PI/n54wrWIdKONsPt3Pcj/UyRD3A6/ZS8rQ== +"@swc/core-win32-arm64-msvc@1.3.21": + version "1.3.21" + resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.21.tgz#07374179e0422ad7352430e8b8fd7fd0f92e099c" + integrity sha512-59gWcdbZxvmyzh+J50yCCodKDYRUnMwNypzzfamF1Vusa4Np+IGMWEaE2KsZUq50OQIRo0PGHpBPMKVYkuGv8g== -"@swc/core-win32-ia32-msvc@1.3.17": - version "1.3.17" - resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.17.tgz#fe95a598e1e378e530bb91ffb4a70180d754a88b" - integrity sha512-hmQovtwsKnb4D+NAKN2HYjTyNE3iXakBrQNSo1u+/KeMU+D6/+XCSdzrg7ob4olqf4yq52FXPPkLYwyDDHRO/g== +"@swc/core-win32-ia32-msvc@1.3.21": + version "1.3.21" + resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.21.tgz#abc4aa533a21da7c0812698ba485314797032edf" + integrity sha512-3gH86ffVAiCmeRy+xSxR5iWSbKy4nUddo4PIahD1zwGJx6LC5ahC/I6EpL1pvoX3KdJKVioUBn0KDfPDUYfqJw== -"@swc/core-win32-x64-msvc@1.3.17": - version "1.3.17" - resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.17.tgz#e778b352bbc2d5cf4f42dd48e26a62c33f110700" - integrity sha512-wl+L7300uFr74WWw+b+mIx9NzMQB8+LCapFc01LqDgFyUFT6HSIIM9/s3zzy5Xh8UpgnkbS0/7rMl+zC1V+nFw== +"@swc/core-win32-x64-msvc@1.3.21": + version "1.3.21" + resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.21.tgz#2d5264370a737e0842434988f9afe9924cc0c4b6" + integrity sha512-JKWLJdJ3oFc8fGBk4P6mGKhW8n+FmEjLLbsST+h94bZmelrSTeShBt3rr+pMMatFevlu/c9lM3OW2GHsZeZNkg== "@swc/core@^1.3.17": - version "1.3.17" - resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.17.tgz#d6cc81071a28e333a6ca2d03b012303c8278a47c" - integrity sha512-wcjmxJqwpo9mQqnyUChyIIxC3nw2xRK07zGMS2zbcId31J+wer5PMbgy0qEqzZEeIswUmL8lBO4whM+wSAmVqA== + version "1.3.21" + resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.21.tgz#5168604c9bcd81740d8aa3a602a2a64dbb9377d1" + integrity sha512-RTmqkm5e5sb+Q+YbyqiE52xjvX+kcIVDgaSdSD7mNy2opgDfIdFMhExmB8UQStt3TLrlpAslWaFNWNmvaHP9rg== optionalDependencies: - "@swc/core-darwin-arm64" "1.3.17" - "@swc/core-darwin-x64" "1.3.17" - "@swc/core-linux-arm-gnueabihf" "1.3.17" - "@swc/core-linux-arm64-gnu" "1.3.17" - "@swc/core-linux-arm64-musl" "1.3.17" - "@swc/core-linux-x64-gnu" "1.3.17" - "@swc/core-linux-x64-musl" "1.3.17" - "@swc/core-win32-arm64-msvc" "1.3.17" - "@swc/core-win32-ia32-msvc" "1.3.17" - "@swc/core-win32-x64-msvc" "1.3.17" + "@swc/core-darwin-arm64" "1.3.21" + "@swc/core-darwin-x64" "1.3.21" + "@swc/core-linux-arm-gnueabihf" "1.3.21" + "@swc/core-linux-arm64-gnu" "1.3.21" + "@swc/core-linux-arm64-musl" "1.3.21" + "@swc/core-linux-x64-gnu" "1.3.21" + "@swc/core-linux-x64-musl" "1.3.21" + "@swc/core-win32-arm64-msvc" "1.3.21" + "@swc/core-win32-ia32-msvc" "1.3.21" + "@swc/core-win32-x64-msvc" "1.3.21" "@tsconfig/node10@^1.0.7": version "1.0.9" @@ -224,9 +224,9 @@ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*", "@types/node@^18": - version "18.11.9" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz#02d013de7058cea16d36168ef2fc653464cfbad4" - integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg== + version "18.11.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.10.tgz#4c64759f3c2343b7e6c4b9caf761c7a3a05cee34" + integrity sha512-juG3RWMBOqcOuXC643OAdSA525V44cVgGV6dUDuiFtss+8Fk5x1hI93Rsld43VeJVIeqlP9I7Fn9/qaVqoEAuQ== "@types/unist@*", "@types/unist@^2.0.0": version "2.0.6" @@ -364,133 +364,133 @@ diff@^5.0.0: resolved "https://registry.yarnpkg.com/diff/-/diff-5.1.0.tgz#bc52d298c5ea8df9194800224445ed43ffc87e40" integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw== -esbuild-android-64@0.15.14: - version "0.15.14" - resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.14.tgz#114e55b0d58fb7b45d7fa3d93516bd13fc8869cc" - integrity sha512-HuilVIb4rk9abT4U6bcFdU35UHOzcWVGLSjEmC58OVr96q5UiRqzDtWjPlCMugjhgUGKEs8Zf4ueIvYbOStbIg== +esbuild-android-64@0.15.16: + version "0.15.16" + resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.16.tgz#0d6a16fa1bea441d5183976f1633183c25a764d5" + integrity sha512-Vwkv/sT0zMSgPSVO3Jlt1pUbnZuOgtOQJkJkyyJFAlLe7BiT8e9ESzo0zQSx4c3wW4T6kGChmKDPMbWTgtliQA== -esbuild-android-arm64@0.15.14: - version "0.15.14" - resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.14.tgz#8541f38a9aacf88e574fb13f5ad4ca51a04c12bb" - integrity sha512-/QnxRVxsR2Vtf3XottAHj7hENAMW2wCs6S+OZcAbc/8nlhbAL/bCQRCVD78VtI5mdwqWkVi3wMqM94kScQCgqg== +esbuild-android-arm64@0.15.16: + version "0.15.16" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.16.tgz#78643bbbf396d26d20ba1f2fcdff3618c7c033e9" + integrity sha512-lqfKuofMExL5niNV3gnhMUYacSXfsvzTa/58sDlBET/hCOG99Zmeh+lz6kvdgvGOsImeo6J9SW21rFCogNPLxg== -esbuild-darwin-64@0.15.14: - version "0.15.14" - resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.14.tgz#b40b334db81ff1e3677a6712b23761748a157c57" - integrity sha512-ToNuf1uifu8hhwWvoZJGCdLIX/1zpo8cOGnT0XAhDQXiKOKYaotVNx7pOVB1f+wHoWwTLInrOmh3EmA7Fd+8Vg== +esbuild-darwin-64@0.15.16: + version "0.15.16" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.16.tgz#de3e91809dcd1ffb64409e2f990bb86e33e4ffd8" + integrity sha512-wo2VWk/n/9V2TmqUZ/KpzRjCEcr00n7yahEdmtzlrfQ3lfMCf3Wa+0sqHAbjk3C6CKkR3WKK/whkMq5Gj4Da9g== -esbuild-darwin-arm64@0.15.14: - version "0.15.14" - resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.14.tgz#44b5c1477bb7bdb852dd905e906f68765e2828bc" - integrity sha512-KgGP+y77GszfYJgceO0Wi/PiRtYo5y2Xo9rhBUpxTPaBgWDJ14gqYN0+NMbu+qC2fykxXaipHxN4Scaj9tUS1A== +esbuild-darwin-arm64@0.15.16: + version "0.15.16" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.16.tgz#bc9cc8d51109d8e9db4ffe2c064dd53d1eb5a2a6" + integrity sha512-fMXaUr5ou0M4WnewBKsspMtX++C1yIa3nJ5R2LSbLCfJT3uFdcRoU/NZjoM4kOMKyOD9Sa/2vlgN8G07K3SJnw== -esbuild-freebsd-64@0.15.14: - version "0.15.14" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.14.tgz#8c57315d238690f34b6ed0c94e5cfc04c858247a" - integrity sha512-xr0E2n5lyWw3uFSwwUXHc0EcaBDtsal/iIfLioflHdhAe10KSctV978Te7YsfnsMKzcoGeS366+tqbCXdqDHQA== +esbuild-freebsd-64@0.15.16: + version "0.15.16" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.16.tgz#f8c54c679c16e9b20a1bf860ca91ba700d6c9c5d" + integrity sha512-UzIc0xlRx5x9kRuMr+E3+hlSOxa/aRqfuMfiYBXu2jJ8Mzej4lGL7+o6F5hzhLqWfWm1GWHNakIdlqg1ayaTNQ== -esbuild-freebsd-arm64@0.15.14: - version "0.15.14" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.14.tgz#2e92acca09258daa849e635565f52469266f0b7b" - integrity sha512-8XH96sOQ4b1LhMlO10eEWOjEngmZ2oyw3pW4o8kvBcpF6pULr56eeYVP5radtgw54g3T8nKHDHYEI5AItvskZg== +esbuild-freebsd-arm64@0.15.16: + version "0.15.16" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.16.tgz#dd28a55df0f062e2c1628266008434c32ddc7adf" + integrity sha512-8xyiYuGc0DLZphFQIiYaLHlfoP+hAN9RHbE+Ibh8EUcDNHAqbQgUrQg7pE7Bo00rXmQ5Ap6KFgcR0b4ALZls1g== -esbuild-linux-32@0.15.14: - version "0.15.14" - resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.14.tgz#ca5ed3e9dff82df486ddde362d7e00775a597dfd" - integrity sha512-6ssnvwaTAi8AzKN8By2V0nS+WF5jTP7SfuK6sStGnDP7MCJo/4zHgM9oE1eQTS2jPmo3D673rckuCzRlig+HMA== +esbuild-linux-32@0.15.16: + version "0.15.16" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.16.tgz#41eb0b9b49b3430b9cc4577f1ad3d414ef70f806" + integrity sha512-iGijUTV+0kIMyUVoynK0v+32Oi8yyp0xwMzX69GX+5+AniNy/C/AL1MjFTsozRp/3xQPl7jVux/PLe2ds10/2w== -esbuild-linux-64@0.15.14: - version "0.15.14" - resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.14.tgz#42952e1d08a299d5f573c567639fb37b033befbf" - integrity sha512-ONySx3U0wAJOJuxGUlXBWxVKFVpWv88JEv0NZ6NlHknmDd1yCbf4AEdClSgLrqKQDXYywmw4gYDvdLsS6z0hcw== +esbuild-linux-64@0.15.16: + version "0.15.16" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.16.tgz#b2fb0c7d49b7a579b2de26fbf4c7afb1835f2073" + integrity sha512-tuSOjXdLw7VzaUj89fIdAaQT7zFGbKBcz4YxbWrOiXkwscYgE7HtTxUavreBbnRkGxKwr9iT/gmeJWNm4djy/g== -esbuild-linux-arm64@0.15.14: - version "0.15.14" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.14.tgz#0c0d788099703327ec0ae70758cb2639ef6c5d88" - integrity sha512-kle2Ov6a1e5AjlHlMQl1e+c4myGTeggrRzArQFmWp6O6JoqqB9hT+B28EW4tjFWgV/NxUq46pWYpgaWXsXRPAg== +esbuild-linux-arm64@0.15.16: + version "0.15.16" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.16.tgz#78fed3745b20251fc3bdc8db35ea0781e9b0e7c6" + integrity sha512-mPYksnfHnemNrvjrDhZyixL/AfbJN0Xn9S34ZOHYdh6/jJcNd8iTsv3JwJoEvTJqjMggjMhGUPJAdjnFBHoH8A== -esbuild-linux-arm@0.15.14: - version "0.15.14" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.14.tgz#751a5ca5042cd60f669b07c3bcec3dd6c4f8151c" - integrity sha512-D2LImAIV3QzL7lHURyCHBkycVFbKwkDb1XEUWan+2fb4qfW7qAeUtul7ZIcIwFKZgPcl+6gKZmvLgPSj26RQ2Q== +esbuild-linux-arm@0.15.16: + version "0.15.16" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.16.tgz#6963f061a2b778aad7df2bfb6fa32d1904313f7f" + integrity sha512-XKcrxCEXDTOuoRj5l12tJnkvuxXBMKwEC5j0JISw3ziLf0j4zIwXbKbTmUrKFWbo6ZgvNpa7Y5dnbsjVvH39bQ== -esbuild-linux-mips64le@0.15.14: - version "0.15.14" - resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.14.tgz#da8ac35f2704de0b52bf53a99c12f604fbe9b916" - integrity sha512-FVdMYIzOLXUq+OE7XYKesuEAqZhmAIV6qOoYahvUp93oXy0MOVTP370ECbPfGXXUdlvc0TNgkJa3YhEwyZ6MRA== +esbuild-linux-mips64le@0.15.16: + version "0.15.16" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.16.tgz#e2aed3527e551f8182c6b0fc8a045726fd98ad87" + integrity sha512-kSJO2PXaxfm0pWY39+YX+QtpFqyyrcp0ZeI8QPTrcFVQoWEPiPVtOfTZeS3ZKedfH+Ga38c4DSzmKMQJocQv6A== -esbuild-linux-ppc64le@0.15.14: - version "0.15.14" - resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.14.tgz#a315b5016917429080c3d32e03319f1ff876ac55" - integrity sha512-2NzH+iuzMDA+jjtPjuIz/OhRDf8tzbQ1tRZJI//aT25o1HKc0reMMXxKIYq/8nSHXiJSnYV4ODzTiv45s+h73w== +esbuild-linux-ppc64le@0.15.16: + version "0.15.16" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.16.tgz#fa3095b24950f63408f46f34b6d9a073ed88d53f" + integrity sha512-NimPikwkBY0yGABw6SlhKrtT35sU4O23xkhlrTT/O6lSxv3Pm5iSc6OYaqVAHWkLdVf31bF4UDVFO+D990WpAA== -esbuild-linux-riscv64@0.15.14: - version "0.15.14" - resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.14.tgz#9f2e0a935e5086d398fc19c7ff5d217bfefe3e12" - integrity sha512-VqxvutZNlQxmUNS7Ac+aczttLEoHBJ9e3OYGqnULrfipRvG97qLrAv9EUY9iSrRKBqeEbSvS9bSfstZqwz0T4Q== +esbuild-linux-riscv64@0.15.16: + version "0.15.16" + resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.16.tgz#19c012dcc55c9d6d2a3855aa77c2c5217182cd1e" + integrity sha512-ty2YUHZlwFOwp7pR+J87M4CVrXJIf5ZZtU/umpxgVJBXvWjhziSLEQxvl30SYfUPq0nzeWKBGw5i/DieiHeKfw== -esbuild-linux-s390x@0.15.14: - version "0.15.14" - resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.14.tgz#53108112faff5a4e1bad17f7b0b0ffa1df4b7efb" - integrity sha512-+KVHEUshX5n6VP6Vp/AKv9fZIl5kr2ph8EUFmQUJnDpHwcfTSn2AQgYYm0HTBR2Mr4d0Wlr0FxF/Cs5pbFgiOw== +esbuild-linux-s390x@0.15.16: + version "0.15.16" + resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.16.tgz#aa61f64740e5b983cc3ebb4183a03df4b435a873" + integrity sha512-VkZaGssvPDQtx4fvVdZ9czezmyWyzpQhEbSNsHZZN0BHvxRLOYAQ7sjay8nMQwYswP6O2KlZluRMNPYefFRs+w== -esbuild-netbsd-64@0.15.14: - version "0.15.14" - resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.14.tgz#5330efc41fe4f1c2bab5462bcfe7a4ffce7ba00a" - integrity sha512-6D/dr17piEgevIm1xJfZP2SjB9Z+g8ERhNnBdlZPBWZl+KSPUKLGF13AbvC+nzGh8IxOH2TyTIdRMvKMP0nEzQ== +esbuild-netbsd-64@0.15.16: + version "0.15.16" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.16.tgz#dffdc104c1f2bafc42be3faa21376c0a092f5702" + integrity sha512-ElQ9rhdY51et6MJTWrCPbqOd/YuPowD7Cxx3ee8wlmXQQVW7UvQI6nSprJ9uVFQISqSF5e5EWpwWqXZsECLvXg== -esbuild-openbsd-64@0.15.14: - version "0.15.14" - resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.14.tgz#ee64944d863e937611fc31adf349e9bb4f5f7eac" - integrity sha512-rREQBIlMibBetgr2E9Lywt2Qxv2ZdpmYahR4IUlAQ1Efv/A5gYdO0/VIN3iowDbCNTLxp0bb57Vf0LFcffD6kA== +esbuild-openbsd-64@0.15.16: + version "0.15.16" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.16.tgz#e5987f8eda55ea5f6ef6258afb1a838158f890bb" + integrity sha512-KgxMHyxMCT+NdLQE1zVJEsLSt2QQBAvJfmUGDmgEq8Fvjrf6vSKB00dVHUEDKcJwMID6CdgCpvYNt999tIYhqA== -esbuild-sunos-64@0.15.14: - version "0.15.14" - resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.14.tgz#29b0b20de6fe6ef50f9fbe533ec20dc4b595f9aa" - integrity sha512-DNVjSp/BY4IfwtdUAvWGIDaIjJXY5KI4uD82+15v6k/w7px9dnaDaJJ2R6Mu+KCgr5oklmFc0KjBjh311Gxl9Q== +esbuild-sunos-64@0.15.16: + version "0.15.16" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.16.tgz#60a085aa4b74d900e4de8c00a9fce207937320a2" + integrity sha512-exSAx8Phj7QylXHlMfIyEfNrmqnLxFqLxdQF6MBHPdHAjT7fsKaX6XIJn+aQEFiOcE4X8e7VvdMCJ+WDZxjSRQ== -esbuild-windows-32@0.15.14: - version "0.15.14" - resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.14.tgz#05e9b159d664809f7a4a8a68ed048d193457b27d" - integrity sha512-pHBWrcA+/oLgvViuG9FO3kNPO635gkoVrRQwe6ZY1S0jdET07xe2toUvQoJQ8KT3/OkxqUasIty5hpuKFLD+eg== +esbuild-windows-32@0.15.16: + version "0.15.16" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.16.tgz#24f94e5fb243d211c7db9a12985fd2880ba98ca3" + integrity sha512-zQgWpY5pUCSTOwqKQ6/vOCJfRssTvxFuEkpB4f2VUGPBpdddZfdj8hbZuFRdZRPIVHvN7juGcpgCA/XCF37mAQ== -esbuild-windows-64@0.15.14: - version "0.15.14" - resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.14.tgz#d5ae086728ab30b72969e40ed0a7a0d9082f2cdd" - integrity sha512-CszIGQVk/P8FOS5UgAH4hKc9zOaFo69fe+k1rqgBHx3CSK3Opyk5lwYriIamaWOVjBt7IwEP6NALz+tkVWdFog== +esbuild-windows-64@0.15.16: + version "0.15.16" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.16.tgz#71d24d68d8b652bf5a93a6c7453c334584fa2211" + integrity sha512-HjW1hHRLSncnM3MBCP7iquatHVJq9l0S2xxsHHj4yzf4nm9TU4Z7k4NkeMlD/dHQ4jPlQQhwcMvwbJiOefSuZw== -esbuild-windows-arm64@0.15.14: - version "0.15.14" - resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.14.tgz#8eb50ab9a0ecaf058593fbad17502749306f801d" - integrity sha512-KW9W4psdZceaS9A7Jsgl4WialOznSURvqX/oHZk3gOP7KbjtHLSsnmSvNdzagGJfxbAe30UVGXRe8q8nDsOSQw== +esbuild-windows-arm64@0.15.16: + version "0.15.16" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.16.tgz#77e804d60dec0390fe8f21401e39b435d5d1b863" + integrity sha512-oCcUKrJaMn04Vxy9Ekd8x23O8LoU01+4NOkQ2iBToKgnGj5eo1vU9i27NQZ9qC8NFZgnQQZg5oZWAejmbsppNA== esbuild@^0.15.14: - version "0.15.14" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.14.tgz#09202b811f1710363d5088a3401a351351c79875" - integrity sha512-pJN8j42fvWLFWwSMG4luuupl2Me7mxciUOsMegKvwCmhEbJ2covUdFnihxm0FMIBV+cbwbtMoHgMCCI+pj1btQ== + version "0.15.16" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.16.tgz#59324e5667985bf6aee8a91ea576baef6872cf21" + integrity sha512-o6iS9zxdHrrojjlj6pNGC2NAg86ECZqIETswTM5KmJitq+R1YmahhWtMumeQp9lHqJaROGnsBi2RLawGnfo5ZQ== optionalDependencies: - "@esbuild/android-arm" "0.15.14" - "@esbuild/linux-loong64" "0.15.14" - esbuild-android-64 "0.15.14" - esbuild-android-arm64 "0.15.14" - esbuild-darwin-64 "0.15.14" - esbuild-darwin-arm64 "0.15.14" - esbuild-freebsd-64 "0.15.14" - esbuild-freebsd-arm64 "0.15.14" - esbuild-linux-32 "0.15.14" - esbuild-linux-64 "0.15.14" - esbuild-linux-arm "0.15.14" - esbuild-linux-arm64 "0.15.14" - esbuild-linux-mips64le "0.15.14" - esbuild-linux-ppc64le "0.15.14" - esbuild-linux-riscv64 "0.15.14" - esbuild-linux-s390x "0.15.14" - esbuild-netbsd-64 "0.15.14" - esbuild-openbsd-64 "0.15.14" - esbuild-sunos-64 "0.15.14" - esbuild-windows-32 "0.15.14" - esbuild-windows-64 "0.15.14" - esbuild-windows-arm64 "0.15.14" + "@esbuild/android-arm" "0.15.16" + "@esbuild/linux-loong64" "0.15.16" + esbuild-android-64 "0.15.16" + esbuild-android-arm64 "0.15.16" + esbuild-darwin-64 "0.15.16" + esbuild-darwin-arm64 "0.15.16" + esbuild-freebsd-64 "0.15.16" + esbuild-freebsd-arm64 "0.15.16" + esbuild-linux-32 "0.15.16" + esbuild-linux-64 "0.15.16" + esbuild-linux-arm "0.15.16" + esbuild-linux-arm64 "0.15.16" + esbuild-linux-mips64le "0.15.16" + esbuild-linux-ppc64le "0.15.16" + esbuild-linux-riscv64 "0.15.16" + esbuild-linux-s390x "0.15.16" + esbuild-netbsd-64 "0.15.16" + esbuild-openbsd-64 "0.15.16" + esbuild-sunos-64 "0.15.16" + esbuild-windows-32 "0.15.16" + esbuild-windows-64 "0.15.16" + esbuild-windows-arm64 "0.15.16" esprima@^4.0.0: version "4.0.1" @@ -570,10 +570,10 @@ formdata-polyfill@^4.0.10: dependencies: fetch-blob "^3.1.2" -fs-extra@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" - integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== +fs-extra@^11.1.0: + version "11.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.0.tgz#5784b102104433bb0e090f48bfc4a30742c357ed" + integrity sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw== dependencies: graceful-fs "^4.2.0" jsonfile "^6.0.1" @@ -1156,9 +1156,9 @@ picomatch@^2.2.2: integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== property-information@^6.0.0: - version "6.1.1" - resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.1.1.tgz#5ca85510a3019726cb9afed4197b7b8ac5926a22" - integrity sha512-hrzC564QIl0r0vy4l6MvRLhafmUowhO/O3KgVSoXIbbA2Sz4j8HGpJc6T2cubRVwMwpdiG/vKGfhT4IixmKN9w== + version "6.2.0" + resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.2.0.tgz#b74f522c31c097b5149e3c3cb8d7f3defd986a1d" + integrity sha512-kma4U7AFCTwpqq5twzC1YVIDXSqg6qQK6JN0smOw8fgRy1OkMi0CYSzFmsy6dnqSenamAtj0CyXMUJ1Mf6oROg== remark-mdx@^2.0.0: version "2.1.5" @@ -1363,17 +1363,17 @@ vfile-location@^4.0.0: vfile "^5.0.0" vfile-message@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.1.2.tgz#a2908f64d9e557315ec9d7ea3a910f658ac05f7d" - integrity sha512-QjSNP6Yxzyycd4SVOtmKKyTsSvClqBPJcd00Z0zuPj3hOIjg0rUPG6DbFGPvUKRgYyaIWLPKpuEclcuvb3H8qA== + version "3.1.3" + resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.1.3.tgz#1360c27a99234bebf7bddbbbca67807115e6b0dd" + integrity sha512-0yaU+rj2gKAyEk12ffdSbBfjnnj+b1zqTBv3OQCTn8yEB02bsPizwdBPrLJjHnK+cU9EMMcUnNv938XcZIkmdA== dependencies: "@types/unist" "^2.0.0" unist-util-stringify-position "^3.0.0" vfile@^5.0.0: - version "5.3.5" - resolved "https://registry.yarnpkg.com/vfile/-/vfile-5.3.5.tgz#ec2e206b1414f561c85b7972bb1eeda8ab47ee61" - integrity sha512-U1ho2ga33eZ8y8pkbQLH54uKqGhFJ6GYIHnnG5AhRpAh3OWjkrRHKa/KogbmQn8We+c0KVV3rTOgR9V/WowbXQ== + version "5.3.6" + resolved "https://registry.yarnpkg.com/vfile/-/vfile-5.3.6.tgz#61b2e70690cc835a5d0d0fd135beae74e5a39546" + integrity sha512-ADBsmerdGBs2WYckrLBEmuETSPyTD4TuLxTrw0DvjirxW1ra4ZwkbzG8ndsv3Q57smvHxo677MHaQrY9yxH8cA== dependencies: "@types/unist" "^2.0.0" is-buffer "^2.0.0" @@ -1420,6 +1420,6 @@ yn@3.1.1: integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== zwitch@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.3.tgz#fd16902a7119d139b6cf13fa41fc909e7936ea09" - integrity sha512-dn/sDAIuRCsXGnBD4P+SA6nv7Y54HQZjC4SPL8PToU3714zu7wSEc1129D/i0+vvjRfOlFo4Zqrpwj+Zhcykhw== + version "2.0.4" + resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.4.tgz#c827d4b0acb76fc3e685a4c6ec2902d51070e9d7" + integrity sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A== From 989f307e52fbb0dcda39d1a9fde5e14fb1c6f6f7 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sat, 3 Dec 2022 02:37:04 -0500 Subject: [PATCH 7/8] [U] dockerize --- Dockerfile | 12 ++++++++++++ README.md | 4 +--- docker-compose.yml | 7 +++++++ scripts/.convert_past/last-hash.txt | 2 +- 4 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..f6b18e9f --- /dev/null +++ b/Dockerfile @@ -0,0 +1,12 @@ +FROM python:3.11-alpine + +WORKDIR /app +COPY requirements.txt /app + +# Since alpine doesn't have stable opencc yet, we need to add its testing repo. +# The opencc binary in the testing repo didn't include a libopencc.so.1 file but did include libopencc.so.1.1, +# So linking is necessary +RUN pip install -r requirements.txt \ + && echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ + && apk add --no-cache opencc@testing git \ + && ln -s $(find / -name "libopencc.so.1*" -print -quit) /usr/lib/libopencc.so.1 \ diff --git a/README.md b/README.md index 140e616d..2f5fe77c 100644 --- a/README.md +++ b/README.md @@ -25,8 +25,6 @@ 更新简体文稿之后请手动执行一个脚本生成繁体文稿。（因为 Github Actions 奇怪的问题太多了，还好难测试，还是换成本地构建啦） -构建环境需要 python >= 3.7，可以执行 `pip install -r requirements.txt` 来安装依赖。 - -然后运行 `./scripts/convert_zh.py` 就可以更新繁体了！ +构建环境需要安装 docker, 然后 `docker-compose up` 就可以更新繁体了! 这个脚本不会覆盖在已有的繁体文件上的更改，更新已经生成过繁体的简体文稿之后会自动合并，不过还是要手动检查一下哦。 diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..40ef899e --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,7 @@ +services: + convert: + container_name: oau-convert + build: . + volumes: + - ".:/app" + entrypoint: "./scripts/convert_zh.py" diff --git a/scripts/.convert_past/last-hash.txt b/scripts/.convert_past/last-hash.txt index 0c763966..46a529b5 100644 --- a/scripts/.convert_past/last-hash.txt +++ b/scripts/.convert_past/last-hash.txt @@ -1 +1 @@ -dacf47e2d848513235bda0af91c15e1b18e7cc97 +8f826c393e75c64e393b74ccdca67330c6462e4e From 8cefeaa65c8a912b3aa5f87a62c6e1d86edcd44b Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sat, 3 Dec 2022 03:25:25 -0500 Subject: [PATCH 8/8] [F] Better dockerfile stability --- Dockerfile | 4 ++-- scripts/.convert_past/last-hash.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f6b18e9f..17ba639b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,5 +8,5 @@ COPY requirements.txt /app # So linking is necessary RUN pip install -r requirements.txt \ && echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ - && apk add --no-cache opencc@testing git \ - && ln -s $(find / -name "libopencc.so.1*" -print -quit) /usr/lib/libopencc.so.1 \ + && apk add --no-cache 'opencc@testing=1.1.4-r0' git \ + && ln -s "/usr/lib/libopencc.so.1.1.3" "/usr/lib/libopencc.so.1" diff --git a/scripts/.convert_past/last-hash.txt b/scripts/.convert_past/last-hash.txt index 46a529b5..e0dd1919 100644 --- a/scripts/.convert_past/last-hash.txt +++ b/scripts/.convert_past/last-hash.txt @@ -1 +1 @@ -8f826c393e75c64e393b74ccdca67330c6462e4e +989f307e52fbb0dcda39d1a9fde5e14fb1c6f6f7