From 368268ae900e2942543d3bb631ccb11d0dd10be8 Mon Sep 17 00:00:00 2001 From: 49659410+tx0c <> Date: Tue, 23 Jan 2024 04:59:42 +0000 Subject: [PATCH 01/12] fix(nomad-badges): update nomad badges copies after campaign ends --- lang/default.json | 32 +++++++++---------- lang/en.json | 32 +++++++++---------- lang/zh-Hans.json | 32 +++++++++---------- lang/zh-Hant.json | 32 +++++++++---------- .../UserProfile/BadgeNomadDialog/Content.tsx | 16 +++++----- 5 files changed, 72 insertions(+), 72 deletions(-) diff --git a/lang/default.json b/lang/default.json index 4a2de3e1c1..34e6c88416 100644 --- a/lang/default.json +++ b/lang/default.json @@ -252,6 +252,10 @@ "4RpVDe": { "defaultMessage": "Delete Draft" }, + "4km7Yc": { + "defaultMessage": "Breaking through history! The torch you've ignited will be the most dazzling support on the Nomad's journey. The Firebolt badge signifies your participation in the Nomad Matters and earning the highest-level Firebolt badge.", + "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" + }, "4l6vz1": { "defaultMessage": "Copy" }, @@ -609,10 +613,6 @@ "defaultMessage": "Badges", "description": "src/components/UserProfile/index.tsx" }, - "DdVBFV": { - "defaultMessage": "Wings have sprouted on the badge, and the halo of dreams is beginning to spin. You have gathered 10 companions on the Nomad's path. Invite another 10 fellow travelers to move towards the final destination together, where the highest level of honor awaits you.", - "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" - }, "DjIpR6": { "defaultMessage": "Set Cover" }, @@ -735,10 +735,6 @@ "defaultMessage": "New Followers This Month", "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx" }, - "GxTjwK": { - "defaultMessage": "Under the moonlight, dreams are about to come true. The Moonlight Dream badge signifies your participation in the Nomad Matters, whether as a contestant or a supporter of exceptional projects. Next, invite 5 companions to join the journey with you, and you'll earn an even higher-level badge?", - "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" - }, "H0JBH6": { "defaultMessage": "Log Out" }, @@ -904,6 +900,10 @@ "defaultMessage": "{articleCount} Articles", "description": "src/views/User/CollectionDetail/CollectionProfile/index.tsx" }, + "LUWKnn": { + "defaultMessage": "Wings have sprouted on the badge, and the halo of dreams is beginning to spin. The Nimbus Ferry badge signifies your participation in the Nomad Matters.", + "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" + }, "LWE7oq": { "defaultMessage": "Saving draft, are you sure you want to leave?" }, @@ -1300,10 +1300,6 @@ "defaultMessage": "Go to Settings", "description": "src/components/Dialogs/BindEmailHintDialog/index.tsx" }, - "XfkltT": { - "defaultMessage": "The dazzling light of a meteor shower is enough to illuminate the night sky. You have already invited 5 companions to participate in the Nomad Matters. Invite 5 more, and you can continue to level up!", - "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" - }, "XgdZSb": { "defaultMessage": "Authors" }, @@ -1512,6 +1508,10 @@ "defaultMessage": "Income", "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx" }, + "dAPUJp": { + "defaultMessage": "The dazzling light of a meteor shower is enough to illuminate the night sky. The Meteor Canoe badge signifies your participation in the Nomad Matters.", + "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" + }, "dAvP6d": { "defaultMessage": "No blocked users yet", "description": "src/views/Me/Settings/Blocked/SettingsBlocked.tsx" @@ -1640,6 +1640,10 @@ "iEJeQH": { "defaultMessage": "Liker ID" }, + "iTcMqz": { + "defaultMessage": "Under the moonlight, dreams are about to come true. The Moonlight Dream badge signifies your participation in the Nomad Matters.", + "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" + }, "icdrwy": { "defaultMessage": "Followed You", "description": "src/components/Buttons/FollowUser/FollowState.tsx" @@ -1853,10 +1857,6 @@ "defaultMessage": "Following", "description": "src/components/UserProfile/index.tsx" }, - "p0oPHP": { - "defaultMessage": "Breaking through history! The torch you've ignited will be the most dazzling support on the Nomad's journey. Congratulations on reaching the final destination of the Nomad Matters with 20 friends and earning the highest-level Firebolt badge.", - "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" - }, "p5qZnJ": { "defaultMessage": "liked", "description": "src/components/Notice/ArticleNotice/ArticleNewAppreciationNotice.tsx" diff --git a/lang/en.json b/lang/en.json index e637bed696..c001d7ef31 100644 --- a/lang/en.json +++ b/lang/en.json @@ -252,6 +252,10 @@ "4RpVDe": { "defaultMessage": "Delete Draft" }, + "4km7Yc": { + "defaultMessage": "Breaking through history! The torch you've ignited will be the most dazzling support on the Nomad's journey. The Firebolt badge signifies your participation in the Nomad Matters and earning the highest-level Firebolt badge.", + "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" + }, "4l6vz1": { "defaultMessage": "Copy" }, @@ -609,10 +613,6 @@ "defaultMessage": "Badges", "description": "src/components/UserProfile/index.tsx" }, - "DdVBFV": { - "defaultMessage": "Wings have sprouted on the badge, and the halo of dreams is beginning to spin. You have gathered 10 companions on the Nomad's path. Invite another 10 fellow travelers to move towards the final destination together, where the highest level of honor awaits you.", - "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" - }, "DjIpR6": { "defaultMessage": "Set Cover" }, @@ -735,10 +735,6 @@ "defaultMessage": "New Followers This Month", "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx" }, - "GxTjwK": { - "defaultMessage": "Under the moonlight, dreams are about to come true. The Moonlight Dream badge signifies your participation in the Nomad Matters, whether as a contestant or a supporter of exceptional projects. Next, invite 5 companions to join the journey with you, and you'll earn an even higher-level badge?", - "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" - }, "H0JBH6": { "defaultMessage": "Log Out" }, @@ -904,6 +900,10 @@ "defaultMessage": "{articleCount} Articles", "description": "src/views/User/CollectionDetail/CollectionProfile/index.tsx" }, + "LUWKnn": { + "defaultMessage": "Wings have sprouted on the badge, and the halo of dreams is beginning to spin. The Nimbus Ferry badge signifies your participation in the Nomad Matters.", + "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" + }, "LWE7oq": { "defaultMessage": "Saving draft, are you sure you want to leave?" }, @@ -1300,10 +1300,6 @@ "defaultMessage": "Go to Settings", "description": "src/components/Dialogs/BindEmailHintDialog/index.tsx" }, - "XfkltT": { - "defaultMessage": "The dazzling light of a meteor shower is enough to illuminate the night sky. You have already invited 5 companions to participate in the Nomad Matters. Invite 5 more, and you can continue to level up!", - "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" - }, "XgdZSb": { "defaultMessage": "Authors" }, @@ -1512,6 +1508,10 @@ "defaultMessage": "Income", "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx" }, + "dAPUJp": { + "defaultMessage": "The dazzling light of a meteor shower is enough to illuminate the night sky. The Meteor Canoe badge signifies your participation in the Nomad Matters.", + "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" + }, "dAvP6d": { "defaultMessage": "No blocked users yet", "description": "src/views/Me/Settings/Blocked/SettingsBlocked.tsx" @@ -1640,6 +1640,10 @@ "iEJeQH": { "defaultMessage": "Liker ID" }, + "iTcMqz": { + "defaultMessage": "Under the moonlight, dreams are about to come true. The Moonlight Dream badge signifies your participation in the Nomad Matters.", + "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" + }, "icdrwy": { "defaultMessage": "Followed You", "description": "src/components/Buttons/FollowUser/FollowState.tsx" @@ -1853,10 +1857,6 @@ "defaultMessage": "Following", "description": "src/components/UserProfile/index.tsx" }, - "p0oPHP": { - "defaultMessage": "Breaking through history! The torch you've ignited will be the most dazzling support on the Nomad's journey. Congratulations on reaching the final destination of the Nomad Matters with 20 friends and earning the highest-level Firebolt badge.", - "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" - }, "p5qZnJ": { "defaultMessage": "liked", "description": "src/components/Notice/ArticleNotice/ArticleNewAppreciationNotice.tsx" diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json index 5149a529ee..7380482b73 100644 --- a/lang/zh-Hans.json +++ b/lang/zh-Hans.json @@ -252,6 +252,10 @@ "4RpVDe": { "defaultMessage": "刪除草稿" }, + "4km7Yc": { + "defaultMessage": "突破历史！你点燃的火炬是游牧者路途上最耀眼的支持。火闪电徽章纪念你曾参与「游牧者计划」并达到最高等级。", + "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" + }, "4l6vz1": { "defaultMessage": "复制" }, @@ -609,10 +613,6 @@ "defaultMessage": "徽章", "description": "src/components/UserProfile/index.tsx" }, - "DdVBFV": { - "defaultMessage": "徽章长出了羽翼，梦想的光轮正开始转动，你已在游牧者之路聚集了 10 位伙伴。再邀请 10 位同行者，一起迈向终点站，最高等级的荣誉正在等着你。", - "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" - }, "DjIpR6": { "defaultMessage": "设置封面" }, @@ -735,10 +735,6 @@ "defaultMessage": "本月新增追踪人数", "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx" }, - "GxTjwK": { - "defaultMessage": "月色之下梦想即将实现，月之梦徽章代表你参与了游牧者计划（参赛或支持了优质计划）。接下来邀请 5 位伙伴一同踏上旅程，将获得更高等级的徽章。", - "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" - }, "H0JBH6": { "defaultMessage": "登出" }, @@ -904,6 +900,10 @@ "defaultMessage": "{articleCount} 篇文章", "description": "src/views/User/CollectionDetail/CollectionProfile/index.tsx" }, + "LUWKnn": { + "defaultMessage": "徽章长出了羽翼，梦想的光轮正开始转动。光轮号徽章纪念你曾参与「游牧者计划」。", + "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" + }, "LWE7oq": { "defaultMessage": "草稿保存中，确定要离开吗？" }, @@ -1300,10 +1300,6 @@ "defaultMessage": "去绑定", "description": "src/components/Dialogs/BindEmailHintDialog/index.tsx" }, - "XfkltT": { - "defaultMessage": "流星雨的绚烂光芒足以点亮夜空，你已经邀请了 5 位伙伴关注游牧者计划，再邀请 5 位就能继续升级！", - "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" - }, "XgdZSb": { "defaultMessage": "值得关注" }, @@ -1512,6 +1508,10 @@ "defaultMessage": "营收", "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx" }, + "dAPUJp": { + "defaultMessage": "流星雨的绚烂光芒足以点亮夜空。流星号徽章纪念你曾参与「游牧者计划」。", + "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" + }, "dAvP6d": { "defaultMessage": "尚无屏蔽记录", "description": "src/views/Me/Settings/Blocked/SettingsBlocked.tsx" @@ -1640,6 +1640,10 @@ "iEJeQH": { "defaultMessage": "设置 Liker ID" }, + "iTcMqz": { + "defaultMessage": "月色之下，梦想即将实现。月之梦徽章纪念你曾参与「游牧者计划」。", + "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" + }, "icdrwy": { "defaultMessage": "追踪了你", "description": "src/components/Buttons/FollowUser/FollowState.tsx" @@ -1853,10 +1857,6 @@ "defaultMessage": "追踪中", "description": "src/components/UserProfile/index.tsx" }, - "p0oPHP": { - "defaultMessage": "突破历史！你点燃的火炬将是游牧者路途上最耀眼的支持。恭喜你与 20 位好友一同抵达游牧者计画的终点，并获得最高等级火闪电徽章。", - "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" - }, "p5qZnJ": { "defaultMessage": "赞赏了", "description": "src/components/Notice/ArticleNotice/ArticleNewAppreciationNotice.tsx" diff --git a/lang/zh-Hant.json b/lang/zh-Hant.json index db795fbdd1..500ea36537 100644 --- a/lang/zh-Hant.json +++ b/lang/zh-Hant.json @@ -252,6 +252,10 @@ "4RpVDe": { "defaultMessage": "刪除草稿" }, + "4km7Yc": { + "defaultMessage": "突破歷史！你點燃的火炬是遊牧者路途上最耀眼的支持。火閃電徽章紀念你曾參與「遊牧者計畫」並達到最高等級。", + "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" + }, "4l6vz1": { "defaultMessage": "複製" }, @@ -609,10 +613,6 @@ "defaultMessage": "徽章", "description": "src/components/UserProfile/index.tsx" }, - "DdVBFV": { - "defaultMessage": "徽章長出了羽翼，夢想的光輪正開始轉動，你已在遊牧者之路聚集了 10 位夥伴。再邀請 10 位同行者，一起邁向終點站，最高等級的榮譽正在等著你。", - "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" - }, "DjIpR6": { "defaultMessage": "設置封面" }, @@ -735,10 +735,6 @@ "defaultMessage": "本月新增追蹤人數", "description": "src/views/Circle/Analytics/FollowerAnalytics/index.tsx" }, - "GxTjwK": { - "defaultMessage": "月色之下夢想即將實現，月之夢徽章代表你參與了遊牧者計畫（參賽或支持了優質計畫）。接下來邀請 5 位夥伴一同踏上旅程，將獲得更高等級的徽章。", - "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" - }, "H0JBH6": { "defaultMessage": "登出" }, @@ -904,6 +900,10 @@ "defaultMessage": "{articleCount} 篇文章", "description": "src/views/User/CollectionDetail/CollectionProfile/index.tsx" }, + "LUWKnn": { + "defaultMessage": "徽章長出了羽翼，夢想的光輪正開始轉動。光輪號徽章紀念你曾參與「遊牧者計畫」。", + "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" + }, "LWE7oq": { "defaultMessage": "草稿保存中，確定要離開嗎？" }, @@ -1300,10 +1300,6 @@ "defaultMessage": "去綁定", "description": "src/components/Dialogs/BindEmailHintDialog/index.tsx" }, - "XfkltT": { - "defaultMessage": "流星雨的絢爛光芒足以點亮夜空，你已經邀請了 5 位夥伴關注遊牧者計畫，再邀請 5 位就能繼續升級！", - "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" - }, "XgdZSb": { "defaultMessage": "值得關注" }, @@ -1512,6 +1508,10 @@ "defaultMessage": "營收", "description": "src/views/Circle/Analytics/IncomeAnalytics/index.tsx" }, + "dAPUJp": { + "defaultMessage": "流星雨的絢爛光芒足以點亮夜空。流星號徽章紀念你曾參與「遊牧者計畫」。", + "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" + }, "dAvP6d": { "defaultMessage": "尚無封鎖紀錄", "description": "src/views/Me/Settings/Blocked/SettingsBlocked.tsx" @@ -1640,6 +1640,10 @@ "iEJeQH": { "defaultMessage": "設置 Liker ID" }, + "iTcMqz": { + "defaultMessage": "月色之下，夢想即將實現。月之夢徽章紀念你曾參與「遊牧者計畫」。", + "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" + }, "icdrwy": { "defaultMessage": "追蹤了你", "description": "src/components/Buttons/FollowUser/FollowState.tsx" @@ -1853,10 +1857,6 @@ "defaultMessage": "追蹤中", "description": "src/components/UserProfile/index.tsx" }, - "p0oPHP": { - "defaultMessage": "突破歷史！你點燃的火炬將是遊牧者路途上最耀眼的支持。恭喜你與 20 位好友一同抵達遊牧者計畫的終點，並獲得最高等級火閃電徽章。", - "description": "src/views/User/UserProfile/BadgeNomadLabel/index.tsx" - }, "p5qZnJ": { "defaultMessage": "讚賞了", "description": "src/components/Notice/ArticleNotice/ArticleNewAppreciationNotice.tsx" diff --git a/src/views/User/UserProfile/BadgeNomadDialog/Content.tsx b/src/views/User/UserProfile/BadgeNomadDialog/Content.tsx index 9897b0e819..3790ccd3a6 100644 --- a/src/views/User/UserProfile/BadgeNomadDialog/Content.tsx +++ b/src/views/User/UserProfile/BadgeNomadDialog/Content.tsx @@ -87,26 +87,26 @@ const BadgeNomadDialogContent = ({

{nomadBadgeLevel === 4 ? ( ) : nomadBadgeLevel === 3 ? ( ) : nomadBadgeLevel === 2 ? ( ) : ( )} From de9514bb33be48289e3539c5c908bb39d4b6fe94 Mon Sep 17 00:00:00 2001 From: robertu <4065233+robertu7@users.noreply.github.com> Date: Tue, 23 Jan 2024 13:45:50 +0800 Subject: [PATCH 02/12] fix(copy): fix copy --- lang/default.json | 8 ++++++++ lang/en.json | 8 ++++++++ lang/zh-Hans.json | 8 ++++++++ lang/zh-Hant.json | 8 ++++++++ src/common/enums/text.ts | 3 --- src/components/Comment/DropdownActions/index.tsx | 14 +++++++++++++- 6 files changed, 45 insertions(+), 4 deletions(-) diff --git a/lang/default.json b/lang/default.json index 34e6c88416..0d55afff8d 100644 --- a/lang/default.json +++ b/lang/default.json @@ -448,6 +448,10 @@ "9J0iCw": { "defaultMessage": "Deleted user" }, + "9OIqBr": { + "defaultMessage": "Edit Comment", + "description": "src/components/Comment/DropdownActions/index.tsx" + }, "9UNFGm": { "defaultMessage": "Transaction Password" }, @@ -907,6 +911,10 @@ "LWE7oq": { "defaultMessage": "Saving draft, are you sure you want to leave?" }, + "LYl9+i": { + "defaultMessage": "Edit", + "description": "src/components/Comment/DropdownActions/index.tsx" + }, "Lb0JsC": { "defaultMessage": "You have blocked that user" }, diff --git a/lang/en.json b/lang/en.json index c001d7ef31..54f5300297 100644 --- a/lang/en.json +++ b/lang/en.json @@ -448,6 +448,10 @@ "9J0iCw": { "defaultMessage": "Deleted user" }, + "9OIqBr": { + "defaultMessage": "Edit Comment", + "description": "src/components/Comment/DropdownActions/index.tsx" + }, "9UNFGm": { "defaultMessage": "Transaction Password" }, @@ -907,6 +911,10 @@ "LWE7oq": { "defaultMessage": "Saving draft, are you sure you want to leave?" }, + "LYl9+i": { + "defaultMessage": "Edit", + "description": "src/components/Comment/DropdownActions/index.tsx" + }, "Lb0JsC": { "defaultMessage": "You have blocked that user" }, diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json index 7380482b73..5010769ca1 100644 --- a/lang/zh-Hans.json +++ b/lang/zh-Hans.json @@ -448,6 +448,10 @@ "9J0iCw": { "defaultMessage": "已注销用户" }, + "9OIqBr": { + "defaultMessage": "编辑评论", + "description": "src/components/Comment/DropdownActions/index.tsx" + }, "9UNFGm": { "defaultMessage": "交易密码" }, @@ -907,6 +911,10 @@ "LWE7oq": { "defaultMessage": "草稿保存中，确定要离开吗？" }, + "LYl9+i": { + "defaultMessage": "编辑", + "description": "src/components/Comment/DropdownActions/index.tsx" + }, "Lb0JsC": { "defaultMessage": "你屏蔽了该用户" }, diff --git a/lang/zh-Hant.json b/lang/zh-Hant.json index 500ea36537..a72f8d7279 100644 --- a/lang/zh-Hant.json +++ b/lang/zh-Hant.json @@ -448,6 +448,10 @@ "9J0iCw": { "defaultMessage": "已註銷用戶" }, + "9OIqBr": { + "defaultMessage": "編輯評論", + "description": "src/components/Comment/DropdownActions/index.tsx" + }, "9UNFGm": { "defaultMessage": "交易密碼" }, @@ -907,6 +911,10 @@ "LWE7oq": { "defaultMessage": "草稿保存中，確定要離開嗎？" }, + "LYl9+i": { + "defaultMessage": "編輯", + "description": "src/components/Comment/DropdownActions/index.tsx" + }, "Lb0JsC": { "defaultMessage": "你封鎖了該用戶" }, diff --git a/src/common/enums/text.ts b/src/common/enums/text.ts index 919ad8bdd8..a5d387bcc4 100644 --- a/src/common/enums/text.ts +++ b/src/common/enums/text.ts @@ -47,7 +47,6 @@ export const TEXT = { edit: '編輯', editArticle: '修訂作品', editCircle: '編輯圍爐', - editComment: '編輯評論', editTag: '編輯標籤', email: '電子信箱', emptySearchResults: '不好意思，什麼都沒搜到', @@ -268,7 +267,6 @@ export const TEXT = { edit: '编辑', editArticle: '修订作品', editCircle: '编辑围炉', - editComment: '编辑评论', editTag: '编辑标签', email: '邮箱', emptySearchResults: '不好意思，什么都没搜到', @@ -497,7 +495,6 @@ export const TEXT = { edit: 'Edit', editArticle: 'Edit', editCircle: 'Edit', - editComment: 'Edit', editTag: 'Edit', email: 'Email', emptySearchResults: 'Result not found', diff --git a/src/components/Comment/DropdownActions/index.tsx b/src/components/Comment/DropdownActions/index.tsx index 453bbd6a17..bcb220ed48 100644 --- a/src/components/Comment/DropdownActions/index.tsx +++ b/src/components/Comment/DropdownActions/index.tsx @@ -240,7 +240,19 @@ const DropdownActions = (props: DropdownActionsProps) => { type, commentId: comment.id, defaultContent: comment.content, - title: article ? 'editComment' : 'edit', + title: article ? ( + + ) : ( + + ), }, ({ openDialog }) => { return { From 162b9badfc2b230ccea7e9d30de6d43f87639029 Mon Sep 17 00:00:00 2001 From: robertu <4065233+robertu7@users.noreply.github.com> Date: Tue, 23 Jan 2024 17:31:19 +0800 Subject: [PATCH 03/12] fix(comment): fix z-index of user mentioning on comment editor (cherry picked from commit 344db5ec9ef4781572d5dc8a9881e1414f512251) --- src/common/styles/vendors/tippy.css | 2 +- src/components/Editor/Article/extensions/mention/suggestion.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/styles/vendors/tippy.css b/src/common/styles/vendors/tippy.css index e8dcaf9d0b..d14b2fd657 100644 --- a/src/common/styles/vendors/tippy.css +++ b/src/common/styles/vendors/tippy.css @@ -133,7 +133,7 @@ line-height: inherit; color: inherit; text-align: center; - background: var(--color-white); + background: transparent; border-radius: 0; } diff --git a/src/components/Editor/Article/extensions/mention/suggestion.ts b/src/components/Editor/Article/extensions/mention/suggestion.ts index 7c53e67b4b..947e356717 100644 --- a/src/components/Editor/Article/extensions/mention/suggestion.ts +++ b/src/components/Editor/Article/extensions/mention/suggestion.ts @@ -69,7 +69,7 @@ export const makeMentionSuggestion = ({ popup = tippy('body', { getReferenceClientRect: props.clientRect, - appendTo: () => document.querySelector('#editor') || document.body, + appendTo: () => document.body, content: component.element, showOnCreate: true, interactive: true, From 140f7acf9090d06f211c67005c88f3915d9193b2 Mon Sep 17 00:00:00 2001 From: robertu <4065233+robertu7@users.noreply.github.com> Date: Tue, 23 Jan 2024 18:15:11 +0800 Subject: [PATCH 04/12] chore(release): v4.28.7 (cherry picked from commit c2b6952d9240be2fb8173c28f58e86c7a3875926) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0bf0f791e8..901ce7eb77 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matters-web", - "version": "4.28.6", + "version": "4.28.7", "description": "codebase of Matters' website", "author": "Matters ", "engines": { From 2b8af4d936f85e6159f9b06a57e27dc7b2324fde Mon Sep 17 00:00:00 2001 From: robertu <4065233+robertu7@users.noreply.github.com> Date: Tue, 23 Jan 2024 19:41:18 +0800 Subject: [PATCH 05/12] fix(copy): remove nomad link (cherry picked from commit 7b2dc82ce934b9a14b5a94357737ed7a40effabf) --- lang/default.json | 3 -- lang/en.json | 3 -- lang/zh-Hans.json | 3 -- lang/zh-Hant.json | 3 -- .../UserProfile/BadgeNomadDialog/Content.tsx | 28 ------------------- .../BadgeNomadDialog/styles.module.css | 5 ---- 6 files changed, 45 deletions(-) diff --git a/lang/default.json b/lang/default.json index 0d55afff8d..a37ab9aee7 100644 --- a/lang/default.json +++ b/lang/default.json @@ -2254,9 +2254,6 @@ "defaultMessage": "left a comment in {circleName}", "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx" }, - "znJ06J": { - "defaultMessage": "About Nomad Matters" - }, "zvNfwL": { "defaultMessage": "Operation too frequent, please try again later.", "description": "ACTION_LIMIT_EXCEEDED" diff --git a/lang/en.json b/lang/en.json index 54f5300297..d40bea03c8 100644 --- a/lang/en.json +++ b/lang/en.json @@ -2254,9 +2254,6 @@ "defaultMessage": "left a comment in {circleName}", "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx" }, - "znJ06J": { - "defaultMessage": "About Nomad Matters" - }, "zvNfwL": { "defaultMessage": "Operation too frequent, please try again later.", "description": "ACTION_LIMIT_EXCEEDED" diff --git a/lang/zh-Hans.json b/lang/zh-Hans.json index 5010769ca1..b004b99541 100644 --- a/lang/zh-Hans.json +++ b/lang/zh-Hans.json @@ -2254,9 +2254,6 @@ "defaultMessage": "在 {circleName} 中留言", "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx" }, - "znJ06J": { - "defaultMessage": "关于游牧者计划" - }, "zvNfwL": { "defaultMessage": "操作过于频繁，请稍候重试", "description": "ACTION_LIMIT_EXCEEDED" diff --git a/lang/zh-Hant.json b/lang/zh-Hant.json index a72f8d7279..69ba0cf491 100644 --- a/lang/zh-Hant.json +++ b/lang/zh-Hant.json @@ -2254,9 +2254,6 @@ "defaultMessage": "在 {circleName} 中留言", "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx" }, - "znJ06J": { - "defaultMessage": "關於遊牧者計畫" - }, "zvNfwL": { "defaultMessage": "操作過於頻繁，請稍候重試", "description": "ACTION_LIMIT_EXCEEDED" diff --git a/src/views/User/UserProfile/BadgeNomadDialog/Content.tsx b/src/views/User/UserProfile/BadgeNomadDialog/Content.tsx index 3790ccd3a6..9a6addbd98 100644 --- a/src/views/User/UserProfile/BadgeNomadDialog/Content.tsx +++ b/src/views/User/UserProfile/BadgeNomadDialog/Content.tsx @@ -1,4 +1,3 @@ -import { useContext } from 'react' import { FormattedMessage } from 'react-intl' import { ReactComponent as Nomad1Background } from '@/public/static/images/badge-nomad1-background.svg' @@ -11,10 +10,8 @@ import { CopyToClipboard, Dialog, IconArrowLeft16, - LanguageContext, useMediaQuery, } from '~/components' -import { UserLanguage } from '~/gql/graphql' import styles from './styles.module.css' @@ -33,10 +30,7 @@ const BadgeNomadDialogContent = ({ isNested, goBack, }: BadgeNomadDialogContentProps) => { - const { lang } = useContext(LanguageContext) const isSmUp = useMediaQuery(`(min-width: ${BREAKPOINTS.MD}px)`) - const campaignLink = process.env.NEXT_PUBLIC_NOMAD_MATTERS_CAMPAIGN_LINK - const campaignLinkEn = process.env.NEXT_PUBLIC_NOMAD_MATTERS_CAMPAIGN_LINK_EN return ( <> @@ -111,28 +105,6 @@ const BadgeNomadDialogContent = ({ /> )}

-

- ( - - {chunks} - - ), - }} - /> -

diff --git a/src/views/User/UserProfile/BadgeNomadDialog/styles.module.css b/src/views/User/UserProfile/BadgeNomadDialog/styles.module.css index 7dbe67cfbf..3585fb9062 100644 --- a/src/views/User/UserProfile/BadgeNomadDialog/styles.module.css +++ b/src/views/User/UserProfile/BadgeNomadDialog/styles.module.css @@ -17,8 +17,3 @@ .title { margin: var(--spacing-base) 0; } - -.extra { - margin-top: var(--spacing-base); - text-decoration-line: underline; -} From 7e5c1d421c093c7adbbfc7536ffaa5a56379a79a Mon Sep 17 00:00:00 2001 From: robertu <4065233+robertu7@users.noreply.github.com> Date: Wed, 7 Feb 2024 12:28:11 +0800 Subject: [PATCH 06/12] fix: rename `.link` classname of --- src/components/Interaction/LinkWrapper/index.tsx | 2 +- src/components/Interaction/LinkWrapper/styles.module.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Interaction/LinkWrapper/index.tsx b/src/components/Interaction/LinkWrapper/index.tsx index 9c9d433cad..28e1e3c59e 100644 --- a/src/components/Interaction/LinkWrapper/index.tsx +++ b/src/components/Interaction/LinkWrapper/index.tsx @@ -36,7 +36,7 @@ export const LinkWrapper: React.FC< } const linkClasses = classNames({ - [styles.link]: true, + [styles.wrapper]: true, [textActiveColor ? styles[`textActive${capitalizeFirstLetter(textActiveColor)}`] : '']: !!textActiveColor, diff --git a/src/components/Interaction/LinkWrapper/styles.module.css b/src/components/Interaction/LinkWrapper/styles.module.css index aa7d3569ef..755119c6d0 100644 --- a/src/components/Interaction/LinkWrapper/styles.module.css +++ b/src/components/Interaction/LinkWrapper/styles.module.css @@ -1,4 +1,4 @@ -.link { +.wrapper { @mixin transition; display: flex; From 7d44f1c4f19d2206acc1f4d938381ee2d721b4f9 Mon Sep 17 00:00:00 2001 From: robertu <4065233+robertu7@users.noreply.github.com> Date: Wed, 7 Feb 2024 16:24:00 +0800 Subject: [PATCH 07/12] fix(dialog): remove unused pseudo-element of ".container" --- src/components/Dialog/styles.module.css | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/components/Dialog/styles.module.css b/src/components/Dialog/styles.module.css index c9d6b375f1..1e96162acf 100644 --- a/src/components/Dialog/styles.module.css +++ b/src/components/Dialog/styles.module.css @@ -12,16 +12,6 @@ border-radius: var(--spacing-x-tight) var(--spacing-x-tight) 0 0; will-change: transform, top; - &::before { - position: absolute; - top: 100%; - right: 0; - left: 0; - height: 300vh; - content: ''; - background: var(--color-white); - } - & :nth-last-child(1 of [data-dialog-entity='true']) { @media (--sm-down) { padding-bottom: var(--spacing-xx-loose); @@ -45,10 +35,6 @@ @media (--sm-up) { border-radius: var(--spacing-x-tight); will-change: opacity; - - &::before { - display: none; - } } } From 2270b6b5be1c23a4698dc1660af7506d01c210f8 Mon Sep 17 00:00:00 2001 From: robertu <4065233+robertu7@users.noreply.github.com> Date: Thu, 8 Feb 2024 15:30:00 +0800 Subject: [PATCH 08/12] fix(node): disable Fetch API to fix SSR issue --- package-lock.json | 6 +++--- package.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index e81657c33b..b9c865c0cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "matters-web", - "version": "4.28.2", + "version": "4.28.7", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "matters-web", - "version": "4.28.2", + "version": "4.28.7", "license": "Apache-2.0", "dependencies": { "@apollo/react-common": "^3.1.3", @@ -175,7 +175,7 @@ "webpack-merge": "^5.9.0" }, "engines": { - "node": ">=16.14 <17.0" + "node": ">=16.14 <19.0" } }, "node_modules/@aashutoshrathi/word-wrap": { diff --git a/package.json b/package.json index 901ce7eb77..5ab9bd9850 100644 --- a/package.json +++ b/package.json @@ -9,14 +9,14 @@ "license": "Apache-2.0", "sideEffects": false, "scripts": { - "dev": "PORT=\"${PORT:-3000}\"; next -p $PORT", + "dev": "PORT=\"${PORT:-3000}\"; NODE_OPTIONS=--no-experimental-fetch; next -p $PORT", "test": "npm run test:unit && npm run test:e2e", "test:e2e": "playwright test", "test:e2e:prepare": "playwright install --with-deps", "test:unit": "vitest run", "test:unit:coverage": "vitest run --coverage", "test:unit:report": "vitest --ui --coverage.enabled=true", - "start": "PORT=\"${PORT:-3000}\"; next start -p $PORT", + "start": "PORT=\"${PORT:-3000}\"; NODE_OPTIONS=--no-experimental-fetch; next start -p $PORT", "build": "npm run i18n && NODE_ENV=production next build", "export": "next export", "format": "prettier --write \"{,!(.next|build|node_modules|coverage|out|lang)/**/*.{js,jsx,ts,tsx,json}}\"", From 4268c2c1227f1fe82884cf9f0d1cbeec15f78c6e Mon Sep 17 00:00:00 2001 From: robertu <4065233+robertu7@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:25:36 +0800 Subject: [PATCH 09/12] fix(node): disable node fetch API to fix SSR issue on Node.js 18 --- package-lock.json | 428 +++++++++++++++++++++++++++++++++++++++++++--- package.json | 5 +- 2 files changed, 404 insertions(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index b9c865c0cb..0e5a82bf15 100644 --- a/package-lock.json +++ b/package-lock.json @@ -143,6 +143,7 @@ "babel-loader": "^9.1.3", "babel-plugin-dynamic-import-node": "^2.3.3", "babel-polyfill": "^6.26.0", + "cross-env": "^7.0.3", "css-has-pseudo": "^6.0.0", "cz-conventional-changelog": "^3.3.0", "eslint": "^8.47.0", @@ -455,6 +456,26 @@ "node": ">=14" } }, + "node_modules/@ardatan/sync-fetch/node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dev": true, + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/@artsy/fresnel": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/@artsy/fresnel/-/fresnel-6.1.0.tgz", @@ -4797,6 +4818,25 @@ "@firebase/app-compat": "0.x" } }, + "node_modules/@firebase/auth-compat/node_modules/node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/@firebase/auth-compat/node_modules/tslib": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", @@ -4816,6 +4856,25 @@ "@firebase/util": "1.x" } }, + "node_modules/@firebase/auth/node_modules/node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/@firebase/auth/node_modules/tslib": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", @@ -4930,6 +4989,25 @@ "@firebase/util": "1.x" } }, + "node_modules/@firebase/firestore/node_modules/node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/@firebase/firestore/node_modules/tslib": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", @@ -4977,6 +5055,25 @@ "resolved": "https://registry.npmjs.org/@firebase/functions-types/-/functions-types-0.6.0.tgz", "integrity": "sha512-hfEw5VJtgWXIRf92ImLkgENqpL6IWpYaXVYiRkFY1jJ9+6tIhWM7IzzwbevwIIud/jaxKVdRzD7QBWfPmkwCYw==" }, + "node_modules/@firebase/functions/node_modules/node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/@firebase/functions/node_modules/tslib": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", @@ -5232,6 +5329,25 @@ "@firebase/util": "1.x" } }, + "node_modules/@firebase/storage/node_modules/node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/@firebase/storage/node_modules/tslib": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", @@ -6200,6 +6316,26 @@ "url": "https://github.com/sponsors/jaydenseric" } }, + "node_modules/@graphql-tools/executor-http/node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dev": true, + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/@graphql-tools/executor-http/node_modules/tslib": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", @@ -11100,6 +11236,26 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/@storybook/core-common/node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dev": true, + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/@storybook/core-common/node_modules/p-locate": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", @@ -13089,6 +13245,26 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "node_modules/@synthetixio/synpress/node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dev": true, + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/@synthetixio/synpress/node_modules/tslib": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", @@ -16597,6 +16773,26 @@ "web-streams-polyfill": "^3.2.0" } }, + "node_modules/@whatwg-node/fetch/node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dev": true, + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/@whatwg-node/node-fetch": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.3.6.tgz", @@ -19747,6 +19943,24 @@ "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz", "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==" }, + "node_modules/cross-env": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", + "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.1" + }, + "bin": { + "cross-env": "src/bin/cross-env.js", + "cross-env-shell": "src/bin/cross-env-shell.js" + }, + "engines": { + "node": ">=10.14", + "npm": ">=6", + "yarn": ">=1" + } + }, "node_modules/cross-fetch": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", @@ -19755,6 +19969,25 @@ "node-fetch": "2.6.7" } }, + "node_modules/cross-fetch/node_modules/node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -28030,6 +28263,26 @@ "whatwg-fetch": "^3.4.1" } }, + "node_modules/isomorphic-fetch/node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dev": true, + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/isomorphic-unfetch": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz", @@ -28039,6 +28292,25 @@ "unfetch": "^4.2.0" } }, + "node_modules/isomorphic-unfetch/node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/isomorphic-ws": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz", @@ -31725,25 +31997,6 @@ "node": ">=10.5.0" } }, - "node_modules/node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, "node_modules/node-fetch-native": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.4.1.tgz", @@ -42635,6 +42888,17 @@ "dev": true, "requires": { "node-fetch": "^2.6.1" + }, + "dependencies": { + "node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dev": true, + "requires": { + "whatwg-url": "^5.0.0" + } + } } }, "@artsy/fresnel": { @@ -45324,6 +45588,14 @@ "tslib": "^2.1.0" }, "dependencies": { + "node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "requires": { + "whatwg-url": "^5.0.0" + } + }, "tslib": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", @@ -45344,6 +45616,14 @@ "tslib": "^2.1.0" }, "dependencies": { + "node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "requires": { + "whatwg-url": "^5.0.0" + } + }, "tslib": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", @@ -45441,6 +45721,14 @@ "tslib": "^2.1.0" }, "dependencies": { + "node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "requires": { + "whatwg-url": "^5.0.0" + } + }, "tslib": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", @@ -45486,6 +45774,14 @@ "tslib": "^2.1.0" }, "dependencies": { + "node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "requires": { + "whatwg-url": "^5.0.0" + } + }, "tslib": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", @@ -45726,6 +46022,14 @@ "tslib": "^2.1.0" }, "dependencies": { + "node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "requires": { + "whatwg-url": "^5.0.0" + } + }, "tslib": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", @@ -46607,6 +46911,15 @@ "integrity": "sha512-FuoE1qtbJ4bBVvv94CC7s0oTnKUGvQs+Rjf1L2SJFfS+HTVVjhPFtehPdQ0JiGPqVNfSSZvL5yzHHQq2Z4WNhQ==", "dev": true }, + "node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dev": true, + "requires": { + "whatwg-url": "^5.0.0" + } + }, "tslib": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", @@ -50150,6 +50463,15 @@ "brace-expansion": "^2.0.1" } }, + "node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dev": true, + "requires": { + "whatwg-url": "^5.0.0" + } + }, "p-locate": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", @@ -51451,6 +51773,15 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dev": true, + "requires": { + "whatwg-url": "^5.0.0" + } + }, "tslib": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", @@ -54197,6 +54528,17 @@ "node-fetch": "^2.6.7", "undici": "^5.12.0", "web-streams-polyfill": "^3.2.0" + }, + "dependencies": { + "node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dev": true, + "requires": { + "whatwg-url": "^5.0.0" + } + } } }, "@whatwg-node/node-fetch": { @@ -56671,12 +57013,31 @@ "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz", "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==" }, + "cross-env": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", + "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.1" + } + }, "cross-fetch": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==", "requires": { "node-fetch": "2.6.7" + }, + "dependencies": { + "node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "requires": { + "whatwg-url": "^5.0.0" + } + } } }, "cross-spawn": { @@ -62979,6 +63340,17 @@ "requires": { "node-fetch": "^2.6.1", "whatwg-fetch": "^3.4.1" + }, + "dependencies": { + "node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dev": true, + "requires": { + "whatwg-url": "^5.0.0" + } + } } }, "isomorphic-unfetch": { @@ -62988,6 +63360,16 @@ "requires": { "node-fetch": "^2.6.1", "unfetch": "^4.2.0" + }, + "dependencies": { + "node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "requires": { + "whatwg-url": "^5.0.0" + } + } } }, "isomorphic-ws": { @@ -65882,14 +66264,6 @@ "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==", "dev": true }, - "node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "requires": { - "whatwg-url": "^5.0.0" - } - }, "node-fetch-native": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.4.1.tgz", diff --git a/package.json b/package.json index 5ab9bd9850..d0cc31bb8c 100644 --- a/package.json +++ b/package.json @@ -9,14 +9,14 @@ "license": "Apache-2.0", "sideEffects": false, "scripts": { - "dev": "PORT=\"${PORT:-3000}\"; NODE_OPTIONS=--no-experimental-fetch; next -p $PORT", + "dev": "PORT=\"${PORT:-3000}\"; cross-env NODE_OPTIONS='--no-experimental-fetch' next -p $PORT", "test": "npm run test:unit && npm run test:e2e", "test:e2e": "playwright test", "test:e2e:prepare": "playwright install --with-deps", "test:unit": "vitest run", "test:unit:coverage": "vitest run --coverage", "test:unit:report": "vitest --ui --coverage.enabled=true", - "start": "PORT=\"${PORT:-3000}\"; NODE_OPTIONS=--no-experimental-fetch; next start -p $PORT", + "start": "PORT=\"${PORT:-3000}\"; cross-env NODE_OPTIONS='--no-experimental-fetch' next start -p $PORT", "build": "npm run i18n && NODE_ENV=production next build", "export": "next export", "format": "prettier --write \"{,!(.next|build|node_modules|coverage|out|lang)/**/*.{js,jsx,ts,tsx,json}}\"", @@ -173,6 +173,7 @@ "babel-loader": "^9.1.3", "babel-plugin-dynamic-import-node": "^2.3.3", "babel-polyfill": "^6.26.0", + "cross-env": "^7.0.3", "css-has-pseudo": "^6.0.0", "cz-conventional-changelog": "^3.3.0", "eslint": "^8.47.0", From 52a0bd6f8eb164c6d3ee6be5b1b9c93247278464 Mon Sep 17 00:00:00 2001 From: robertu <4065233+robertu7@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:43:15 +0800 Subject: [PATCH 10/12] fix(node): move cross-env to dependencies --- package-lock.json | 24 +++++------------------- package.json | 2 +- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0e5a82bf15..9be946997a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,6 +40,7 @@ "autosize": "^6.0.1", "classnames": "^2.3.2", "colorthief": "^2.4.0", + "cross-env": "^7.0.3", "d3-array": "^2.12.1", "d3-axis": "^2.1.0", "d3-ease": "^2.0.0", @@ -143,7 +144,6 @@ "babel-loader": "^9.1.3", "babel-plugin-dynamic-import-node": "^2.3.3", "babel-polyfill": "^6.26.0", - "cross-env": "^7.0.3", "css-has-pseudo": "^6.0.0", "cz-conventional-changelog": "^3.3.0", "eslint": "^8.47.0", @@ -19947,7 +19947,6 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", - "dev": true, "dependencies": { "cross-spawn": "^7.0.1" }, @@ -19992,7 +19991,6 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -20006,7 +20004,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, "dependencies": { "isexe": "^2.0.0" }, @@ -28242,8 +28239,7 @@ "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" }, "node_modules/isobject": { "version": "3.0.1", @@ -33186,7 +33182,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, "engines": { "node": ">=8" } @@ -37574,7 +37569,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, "dependencies": { "shebang-regex": "^3.0.0" }, @@ -37586,7 +37580,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, "engines": { "node": ">=8" } @@ -57017,7 +57010,6 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", - "dev": true, "requires": { "cross-spawn": "^7.0.1" } @@ -57044,7 +57036,6 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, "requires": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -57055,7 +57046,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, "requires": { "isexe": "^2.0.0" } @@ -63324,8 +63314,7 @@ "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" }, "isobject": { "version": "3.0.1", @@ -67183,8 +67172,7 @@ "path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" }, "path-parse": { "version": "1.0.7", @@ -70371,7 +70359,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, "requires": { "shebang-regex": "^3.0.0" } @@ -70379,8 +70366,7 @@ "shebang-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" }, "shell-quote": { "version": "1.7.4", diff --git a/package.json b/package.json index d0cc31bb8c..e2286e0ac9 100644 --- a/package.json +++ b/package.json @@ -121,6 +121,7 @@ "url-loader": "^4.1.1", "use-debounce": "^9.0.4", "validator": "^13.11.0", + "cross-env": "^7.0.3", "viem": "^1.2.12", "wagmi": "^1.3.8" }, @@ -173,7 +174,6 @@ "babel-loader": "^9.1.3", "babel-plugin-dynamic-import-node": "^2.3.3", "babel-polyfill": "^6.26.0", - "cross-env": "^7.0.3", "css-has-pseudo": "^6.0.0", "cz-conventional-changelog": "^3.3.0", "eslint": "^8.47.0", From e734aa2e99da0b00badefd857aaa20fc4915f2a7 Mon Sep 17 00:00:00 2001 From: robertu <4065233+robertu7@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:08:29 +0800 Subject: [PATCH 11/12] ci: deploy to new EB envs --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2956ccb7ca..34d4080b7f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -97,7 +97,7 @@ jobs: aws_access_key: ${{ secrets.AWS_ACCESS_KEY_ID }} aws_secret_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} application_name: matters-stage - environment_name: matters-client-develop + environment_name: matters-client-develop-node-v18 version_label: matters-web-develop-${{ hashFiles('deploy.zip') }} version_description: ${{ github.SHA }} region: ap-southeast-1 @@ -124,7 +124,7 @@ jobs: aws_access_key: ${{ secrets.AWS_ACCESS_KEY_ID }} aws_secret_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} application_name: matters-prod - environment_name: matters-client-prod + environment_name: matters-client-prod-node-v18 version_label: matters-web-prod-${{ hashFiles('deploy.zip') }} version_description: ${{ github.SHA }} region: ap-southeast-1 From 5025e75e849aeb7b766865c0259294eaf51ff2db Mon Sep 17 00:00:00 2001 From: robertu <4065233+robertu7@users.noreply.github.com> Date: Fri, 16 Feb 2024 10:10:51 +0800 Subject: [PATCH 12/12] chore(release): v4.28.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e2286e0ac9..83a7a970b3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matters-web", - "version": "4.28.7", + "version": "4.28.8", "description": "codebase of Matters' website", "author": "Matters ", "engines": {