Merge pull request #4071 from thematters/develop

Release: v4.28.2

.env.prod

@@ -33,4 +33,4 @@ NEXT_PUBLIC_CLOUDFLARE_TURNSTILE_SITE_KEY=0x4AAAAAAAKVODkJMwfIxG78
 DEBUG=false
 NEXT_PUBLIC_GOOGLE_CLIENT_ID=751677068109-rkml7q9ujf8ems09cclh7qckf14svcgs.apps.googleusercontent.com
 NEXT_PUBLIC_TWITTER_CLIENT_ID=cmdKbUlyd1ZZZDZYa3dTampidGo6MTpjaQ
-NEXT_PUBLIC_FACEBOOK_CLIENT_ID=1415638158583454
+NEXT_PUBLIC_FACEBOOK_CLIENT_ID=161556310354354

.storybook/main.js

@@ -1,26 +1,43 @@
-const tsconfig = require('../tsconfig.json')
 const path = require('path')
-const { mergeWithCustomize } = require('webpack-merge')
+const postcssOptions = require('../postcss.config.json')
 
 module.exports = {
+  framework: {
+    name: '@storybook/nextjs',
+    options: {},
+  },
   stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
   addons: [
     '@storybook/addon-links',
     '@storybook/addon-essentials',
     '@storybook/addon-a11y',
     '@storybook/addon-mdx-gfm',
     {
-      name: '@storybook/addon-styling',
+      name: '@storybook/addon-styling-webpack',
       options: {
-        postCss: true,
-        cssModules: true,
+        rules: [
+          {
+            test: /\.css$/,
+            sideEffects: true,
+            use: [
+              require.resolve('style-loader'),
+              {
+                loader: require.resolve('css-loader'),
+                options: { importLoaders: 1 },
+              },
+              {
+                loader: require.resolve('postcss-loader'),
+                options: {
+                  implementation: require.resolve('postcss'),
+                  postcssOptions,
+                },
+              },
+            ],
+          },
+        ],
       },
     },
   ],
-  framework: {
-    name: '@storybook/nextjs',
-    options: {},
-  },
 
   webpackFinal: async (config) => {
     // this modifies the existing image rule to exclude .svg files

lang/default.json

@@ -53,10 +53,6 @@
     "defaultMessage": "Unknown error. Please try again later.",
     "description": "UNKNOWN_ERROR"
   },
-  "/asuIY": {
-    "defaultMessage": "Enter Community",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
-  },
   "/jJLYy": {
     "defaultMessage": "Transactions"
   },
@@ -404,9 +400,6 @@
   "A3g33H": {
     "defaultMessage": "Archived articles can only be seen by you, and this operation cannot be undone. If this article has been added to collections, it will be removed. (IPFS version will not be effected)"
   },
-  "A41QIy": {
-    "defaultMessage": "Enter Password"
-  },
   "A6ozr9": {
     "defaultMessage": "Collection name"
   },
@@ -436,10 +429,6 @@
     "defaultMessage": "Maintain",
     "description": "src/views/TagDetail/Owner/index.tsx"
   },
-  "ANhCde": {
-    "defaultMessage": "Start creating now!",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
-  },
   "AVpR3Q": {
     "defaultMessage": "Wallet linked",
     "description": "src/components/UserProfile/WalletLabel/index.tsx"
@@ -900,10 +889,6 @@
     "defaultMessage": "Number of supporters",
     "description": "src/components/ArticleDigest/Published/FooterActions/index.tsx"
   },
-  "NzfL1d": {
-    "defaultMessage": "Enter password again",
-    "description": "src/components/Forms/EmailSignUpForm/Password.tsx"
-  },
   "O0MQs/": {
     "defaultMessage": "Please add email first",
     "description": "src/views/Me/Settings/Settings/Password/index.tsx"
@@ -927,10 +912,6 @@
     "defaultMessage": "New likes",
     "description": "src/views/Me/Settings/Notifications/GeneralSettings/index.tsx"
   },
-  "OwKIEe": {
-    "defaultMessage": "{count, plural, =1 {1 article} other {{count} articles}}",
-    "description": "src/components/Book/index.tsx"
-  },
   "PLBmDT": {
     "defaultMessage": "Password",
     "description": "src/views/Me/Settings/Settings/Password/index.tsx"
@@ -1151,10 +1132,6 @@
     "defaultMessage": "Unpin Comment",
     "description": "src/components/Comment/DropdownActions/PinButton.tsx"
   },
-  "XH0Lb6": {
-    "defaultMessage": "Welcome to Matters!",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
-  },
   "XHMco9": {
     "defaultMessage": "subscribers",
     "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
@@ -1630,9 +1607,6 @@
     "defaultMessage": "Edit",
     "description": "src/components/Comment/DropdownActions/EditButton.tsx"
   },
-  "ml3SZN": {
-    "defaultMessage": "Minimum 8 characters. Uppercase/lowercase letters, numbers and symbols are allowed"
-  },
   "mp9SBo": {
     "defaultMessage": "Circle notifications",
     "description": "src/views/Me/Settings/Notifications/index.tsx"
@@ -1786,10 +1760,6 @@
   "rdZi0V": {
     "defaultMessage": "It seems you've come to an unknown space, please go back and retry"
   },
-  "reOeq5": {
-    "defaultMessage": "You have created your personal creative space. Publish your first work!",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
-  },
   "rfz/fN": {
     "defaultMessage": "Recommended size: 1600px x 900px"
   },
@@ -1813,10 +1783,6 @@
     "defaultMessage": "Log in",
     "description": "src/components/Buttons/Login/index.tsx"
   },
-  "stjoBH": {
-    "defaultMessage": "Now, go like the authors you support! Your Likes will become their income",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
-  },
   "sy+pv5": {
     "defaultMessage": "Email"
   },

lang/en.json

@@ -53,10 +53,6 @@
     "defaultMessage": "Unknown error. Please try again later.",
     "description": "UNKNOWN_ERROR"
   },
-  "/asuIY": {
-    "defaultMessage": "Enter Community",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
-  },
   "/jJLYy": {
     "defaultMessage": "Transactions"
   },
@@ -404,9 +400,6 @@
   "A3g33H": {
     "defaultMessage": "Archived articles can only be seen by you, and this operation cannot be undone. If this article has been added to collections, it will be removed. (IPFS version will not be effected)"
   },
-  "A41QIy": {
-    "defaultMessage": "Enter Password"
-  },
   "A6ozr9": {
     "defaultMessage": "Collection name"
   },
@@ -436,10 +429,6 @@
     "defaultMessage": "Maintain",
     "description": "src/views/TagDetail/Owner/index.tsx"
   },
-  "ANhCde": {
-    "defaultMessage": "Start creating now!",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
-  },
   "AVpR3Q": {
     "defaultMessage": "Wallet linked",
     "description": "src/components/UserProfile/WalletLabel/index.tsx"
@@ -900,10 +889,6 @@
     "defaultMessage": "Number of supporters",
     "description": "src/components/ArticleDigest/Published/FooterActions/index.tsx"
   },
-  "NzfL1d": {
-    "defaultMessage": "Enter password again",
-    "description": "src/components/Forms/EmailSignUpForm/Password.tsx"
-  },
   "O0MQs/": {
     "defaultMessage": "Please add email first",
     "description": "src/views/Me/Settings/Settings/Password/index.tsx"
@@ -927,10 +912,6 @@
     "defaultMessage": "New likes",
     "description": "src/views/Me/Settings/Notifications/GeneralSettings/index.tsx"
   },
-  "OwKIEe": {
-    "defaultMessage": "{count, plural, =1 {1 article} other {{count} articles}}",
-    "description": "src/components/Book/index.tsx"
-  },
   "PLBmDT": {
     "defaultMessage": "Password",
     "description": "src/views/Me/Settings/Settings/Password/index.tsx"
@@ -1151,10 +1132,6 @@
     "defaultMessage": "Unpin Comment",
     "description": "src/components/Comment/DropdownActions/PinButton.tsx"
   },
-  "XH0Lb6": {
-    "defaultMessage": "Welcome to Matters!",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
-  },
   "XHMco9": {
     "defaultMessage": "subscribers",
     "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
@@ -1630,9 +1607,6 @@
     "defaultMessage": "Edit",
     "description": "src/components/Comment/DropdownActions/EditButton.tsx"
   },
-  "ml3SZN": {
-    "defaultMessage": "Minimum 8 characters. Uppercase/lowercase letters, numbers and symbols are allowed"
-  },
   "mp9SBo": {
     "defaultMessage": "Circle notifications",
     "description": "src/views/Me/Settings/Notifications/index.tsx"
@@ -1786,10 +1760,6 @@
   "rdZi0V": {
     "defaultMessage": "It seems you've come to an unknown space, please go back and retry"
   },
-  "reOeq5": {
-    "defaultMessage": "You have created your personal creative space. Publish your first work!",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
-  },
   "rfz/fN": {
     "defaultMessage": "Recommended size: 1600px x 900px"
   },
@@ -1813,10 +1783,6 @@
     "defaultMessage": "Log in",
     "description": "src/components/Buttons/Login/index.tsx"
   },
-  "stjoBH": {
-    "defaultMessage": "Now, go like the authors you support! Your Likes will become their income",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
-  },
   "sy+pv5": {
     "defaultMessage": "Email"
   },

lang/zh-Hans.json

@@ -53,10 +53,6 @@
     "defaultMessage": "不知道哪里出错了，过几分钟看看",
     "description": "UNKNOWN_ERROR"
   },
-  "/asuIY": {
-    "defaultMessage": "进入社区",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
-  },
   "/jJLYy": {
     "defaultMessage": "交易记录"
   },
@@ -404,9 +400,6 @@
   "A3g33H": {
     "defaultMessage": "归档的作品仅自己可见，且操作无法撤销。如文章已加入选集，将从选集中移除。（已发布到 IPFS 的版本不受影响）"
   },
-  "A41QIy": {
-    "defaultMessage": "输入密码"
-  },
   "A6ozr9": {
     "defaultMessage": "选集名称"
   },
@@ -436,10 +429,6 @@
     "defaultMessage": "主理",
     "description": "src/views/TagDetail/Owner/index.tsx"
   },
-  "ANhCde": {
-    "defaultMessage": "马上开始你的创作吧！",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
-  },
   "AVpR3Q": {
     "defaultMessage": "已绑定钱包",
     "description": "src/components/UserProfile/WalletLabel/index.tsx"
@@ -900,10 +889,6 @@
     "defaultMessage": "支持者数量",
     "description": "src/components/ArticleDigest/Published/FooterActions/index.tsx"
   },
-  "NzfL1d": {
-    "defaultMessage": "再次输入密码",
-    "description": "src/components/Forms/EmailSignUpForm/Password.tsx"
-  },
   "O0MQs/": {
     "defaultMessage": "请先绑定邮箱",
     "description": "src/views/Me/Settings/Settings/Password/index.tsx"
@@ -927,10 +912,6 @@
     "defaultMessage": "作品被赞赏",
     "description": "src/views/Me/Settings/Notifications/GeneralSettings/index.tsx"
   },
-  "OwKIEe": {
-    "defaultMessage": "{count, plural, =1 {1 篇文章} other {{count} 篇文章}}",
-    "description": "src/components/Book/index.tsx"
-  },
   "PLBmDT": {
     "defaultMessage": "登录密码",
     "description": "src/views/Me/Settings/Settings/Password/index.tsx"
@@ -1151,10 +1132,6 @@
     "defaultMessage": "取消精选",
     "description": "src/components/Comment/DropdownActions/PinButton.tsx"
   },
-  "XH0Lb6": {
-    "defaultMessage": "欢迎加入 Matters！",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
-  },
   "XHMco9": {
     "defaultMessage": "人",
     "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
@@ -1630,9 +1607,6 @@
     "defaultMessage": "编辑",
     "description": "src/components/Comment/DropdownActions/EditButton.tsx"
   },
-  "ml3SZN": {
-    "defaultMessage": "至少 8 个字符，支持英文大小写字母、数字和特殊符号"
-  },
   "mp9SBo": {
     "defaultMessage": "围炉通知",
     "description": "src/views/Me/Settings/Notifications/index.tsx"
@@ -1786,10 +1760,6 @@
   "rdZi0V": {
     "defaultMessage": "你似乎遨游到了一个未知空间，请返回重试"
   },
-  "reOeq5": {
-    "defaultMessage": "你已拥有个人创作空间站，期待你的第一篇作品。",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
-  },
   "rfz/fN": {
     "defaultMessage": "建議尺寸 1600 x 900 像素"
   },
@@ -1813,10 +1783,6 @@
     "defaultMessage": "登录",
     "description": "src/components/Buttons/Login/index.tsx"
   },
-  "stjoBH": {
-    "defaultMessage": "现在，去为你喜欢的作者打赏吧！你的每一次打赏都将为作者带来收入。",
-    "description": "src/components/Forms/EmailSignUpForm/Complete.tsx"
-  },
   "sy+pv5": {
     "defaultMessage": "邮箱"
   },