Skip to content

Commit

Permalink
Merge pull request #3182 from thematters/develop
Browse files Browse the repository at this point in the history
chore(release): v4.16.0
  • Loading branch information
gary02 authored Feb 17, 2023
2 parents 1e81e2e + e40eead commit ad89dd4
Show file tree
Hide file tree
Showing 56 changed files with 3,062 additions and 387 deletions.
9 changes: 8 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@
]
],
"plugins": [
"@babel/plugin-proposal-optional-chaining"
"@babel/plugin-proposal-optional-chaining",
[
"formatjs",
{
"idInterpolationPattern": "[sha512:contenthash:base64:6]",
"ast": true
}
]
]
}
7 changes: 4 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
cache: 'npm'

- name: Install Dependencies
run: npm ci --legacy-peer-deps
run: npm ci

- name: Generate Types (develop)
if: github.base_ref == 'develop'
Expand All @@ -40,7 +40,8 @@ jobs:

- name: Lint
run: |
npm run lint \
npm run i18n \
&& npm run lint \
&& npm run format:check
# - name: Test
Expand Down Expand Up @@ -74,7 +75,7 @@ jobs:
if: github.base_ref == 'develop' || github.base_ref == 'master'
run: |
rm -rf node_modules \
&& npm install --production --legacy-peer-deps \
&& npm install --production \
&& zip -r --symlinks deploy.zip . -x .git/\*
- name: Upload Assets (develop - R2)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
cache: 'npm'

- name: Install Dependencies
run: npm ci --legacy-peer-deps
run: npm ci

- name: Generate Types
if: github.base_ref == 'develop'
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/test_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
cache: 'npm'

- name: Install Dependencies
run: npm ci --legacy-peer-deps
run: npm ci

- name: Generate Types (Develop)
if: github.base_ref != 'master'
Expand All @@ -28,7 +28,8 @@ jobs:

- name: Lint
run: |
npm run lint \
npm run i18n \
&& npm run lint \
&& npm run format:check
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
cache: 'npm'

- name: Install Dependencies
run: npm ci --legacy-peer-deps
run: npm ci

- name: Get installed Playwright version
id: playwright-version
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,6 @@ tsconfig.tsbuildinfo

# Codegen
/src/gql/

# i18n
compiled-lang
5 changes: 3 additions & 2 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npm run format -- --list-different && \
npm run lint
npm run format -- --list-different \
&& npm run i18n \
&& npm run lint \
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
unsafe-perm=true
legacy-peer-deps=true
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

### Start local dev

- Install dependencies: `npm i --legacy-peer-deps`
- Install dependencies: `npm i`
- Environment variables: `cp .env.local.example .env.local`
- Run `npm run gen:type`
- Run `npm run dev`, then go to `http://localhost:3000/`
Expand Down
3 changes: 3 additions & 0 deletions crowdin.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
files:
- source: /lang/en.json
translation: /lang/%locale%.json
46 changes: 46 additions & 0 deletions lang/en.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"3uQKhx": {
"defaultMessage": "Please email",
"description": "src/views/Help/index.tsx"
},
"BqXRy4": {
"defaultMessage": "Download App",
"description": "src/views/Help/index.tsx"
},
"FaTb0A": {
"defaultMessage": "Install MetaMask",
"description": "src/components/Forms/WalletAuthForm/Select.tsx"
},
"JMRVO6": {
"defaultMessage": "Matters Community",
"description": "src/views/Help/index.tsx"
},
"RKs1fz": {
"defaultMessage": "Open Source",
"description": "src/views/Help/index.tsx"
},
"cfL5uk": {
"defaultMessage": "Over 200 words, current {numbers}",
"description": "src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx"
},
"dnsfmR": {
"defaultMessage": "for bug reports or suggestions. We will reply to you as soon we can!",
"description": "src/views/Help/index.tsx"
},
"nmmItN": {
"defaultMessage": "About Us",
"description": "src/views/Help/index.tsx"
},
"q7jZPx": {
"defaultMessage": "Term of Services",
"description": "src/views/Help/index.tsx"
},
"qXcvBF": {
"defaultMessage": "Explore Matters",
"description": "src/views/Help/index.tsx"
},
"rXbLl7": {
"defaultMessage": "Migrate to Matters",
"description": "src/views/Help/index.tsx"
}
}
46 changes: 46 additions & 0 deletions lang/zh-Hans.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"cfL5uk": {
"defaultMessage": "已超过 200 字,目前 {numbers} 字",
"description": "src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx"
},
"3uQKhx": {
"defaultMessage": "若你希望向 Matters 提出建议,或遭遇操作异常,请发送邮件至",
"description": "src/views/Help/index.tsx"
},
"BqXRy4": {
"defaultMessage": "下载应用",
"description": "src/views/Help/index.tsx"
},
"FaTb0A": {
"defaultMessage": "安装 MetaMask",
"description": "src/components/Forms/WalletAuthForm/Select.tsx"
},
"JMRVO6": {
"defaultMessage": "社区共建基地",
"description": "src/views/Help/index.tsx"
},
"RKs1fz": {
"defaultMessage": "开放社区",
"description": "src/views/Help/index.tsx"
},
"dnsfmR": {
"defaultMessage": ",我们会尽快回复!",
"description": "src/views/Help/index.tsx"
},
"nmmItN": {
"defaultMessage": "关于我们",
"description": "src/views/Help/index.tsx"
},
"q7jZPx": {
"defaultMessage": "用户协议",
"description": "src/views/Help/index.tsx"
},
"qXcvBF": {
"defaultMessage": "玩转 Matters 实用指南",
"description": "src/views/Help/index.tsx"
},
"rXbLl7": {
"defaultMessage": "一键搬家",
"description": "src/views/Help/index.tsx"
}
}
46 changes: 46 additions & 0 deletions lang/zh-Hant.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"cfL5uk": {
"defaultMessage": "已超過 200 字,目前 {numbers} 字",
"description": "src/components/UserProfile/DropdownActions/EditProfileDialog/Content.tsx"
},
"3uQKhx": {
"defaultMessage": "若你希望向 Matters 提出建議,或遭遇操作異常,请發送郵件至",
"description": "src/views/Help/index.tsx"
},
"BqXRy4": {
"defaultMessage": "下載應用",
"description": "src/views/Help/index.tsx"
},
"FaTb0A": {
"defaultMessage": "安裝 MetaMask",
"description": "src/components/Forms/WalletAuthForm/Select.tsx"
},
"JMRVO6": {
"defaultMessage": "社區共建基地",
"description": "src/views/Help/index.tsx"
},
"RKs1fz": {
"defaultMessage": "開放社區",
"description": "src/views/Help/index.tsx"
},
"dnsfmR": {
"defaultMessage": ",我們會儘快回覆!",
"description": "src/views/Help/index.tsx"
},
"nmmItN": {
"defaultMessage": "關於我們",
"description": "src/views/Help/index.tsx"
},
"q7jZPx": {
"defaultMessage": "用戶協議",
"description": "src/views/Help/index.tsx"
},
"qXcvBF": {
"defaultMessage": "玩轉 Matters 實用指南",
"description": "src/views/Help/index.tsx"
},
"rXbLl7": {
"defaultMessage": "一鍵搬家",
"description": "src/views/Help/index.tsx"
}
}
Loading

0 comments on commit ad89dd4

Please sign in to comment.