Skip to content

Commit 74cc549

Browse files
marihachimarihachi
committed
Merge branch 'develop'
2 parents fcd1632 + 2778c23 commit 74cc549

32 files changed

+13229
-344
lines changed

Diff for: ‎.eslintignore

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
node_modules
2+
/built
3+
/coverage
4+
/.eslintrc.js
5+
/jest.config.ts
6+
parser.js

Diff for: ‎.eslintrc.js

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
module.exports = {
2+
root: true,
3+
parser: '@typescript-eslint/parser',
4+
plugins: [
5+
'@typescript-eslint',
6+
],
7+
extends: [
8+
'eslint:recommended',
9+
'plugin:@typescript-eslint/recommended',
10+
],
11+
rules: {
12+
'indent': ['error', 'tab', {
13+
'SwitchCase': 1,
14+
'flatTernaryExpressions': true,
15+
}],
16+
'eol-last': ['error', 'always'],
17+
'semi': ['error', 'always'],
18+
'quotes': ['error', 'single'],
19+
'keyword-spacing': ['error', {
20+
'before': true,
21+
'after': true,
22+
}],
23+
'no-multi-spaces': ['error'],
24+
'no-var': ['error'],
25+
'prefer-arrow-callback': ['error'],
26+
'no-throw-literal': ['error'],
27+
'no-param-reassign': ['warn'],
28+
'no-constant-condition': ['warn'],
29+
'no-empty-pattern': ['warn'],
30+
'@typescript-eslint/no-inferrable-types': ['warn'],
31+
},
32+
};

Diff for: ‎.github/ISSUE_TEMPLATE/config.yml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
contact_links:
2+
- name: 👪 Misskey Forum
3+
url: https://forum.misskey.io/
4+
about: Ask questions and share knowledge
5+
- name: 💬 Misskey official Discord
6+
url: https://discord.gg/Wp8gVStHW3
7+
about: Chat freely about Misskey

Diff for: ‎.github/pull_request_template.md

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<!-- ℹ お読みください
2+
PRありがとうございます！ PRを作成する前に、コントリビューションガイドをご確認ください:
3+
https://github.com/misskey-dev/misskey.js/blob/develop/CONTRIBUTING.md
4+
-->
5+
<!-- ℹ README
6+
Thank you for your PR! Before creating a PR, please check the contribution guide:
7+
https://github.com/misskey-dev/misskey.js/blob/develop/docs/CONTRIBUTING.en.md
8+
-->
9+
10+
# What
11+
<!-- このPRで何をしたのか？ どう変わるのか？ -->
12+
<!-- What did you do with this PR? How will it change things? -->
13+
14+
# Why
15+
<!-- なぜそうするのか？ どういう意図なのか？ 何が困っているのか？ -->
16+
<!-- Why do you do it? What are your intentions? What is the problem? -->
17+
18+
# Additional info (optional)
19+
<!-- テスト観点など -->
20+
<!-- Test perspective, etc -->

Diff for: ‎.github/workflows/api.yml

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: API report
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
report:
7+
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- name: Checkout
12+
uses: actions/checkout@v2
13+
14+
- name: Setup Node.js
15+
uses: actions/setup-node@v1
16+
with:
17+
node-version: 16.5.0
18+
19+
- name: Cache dependencies
20+
uses: actions/cache@v2
21+
with:
22+
path: ~/.npm
23+
key: npm-${{ hashFiles('package-lock.json') }}
24+
restore-keys: npm-
25+
26+
- name: Install dependencies
27+
run: npm ci
28+
29+
- name: Build
30+
run: npm run build
31+
32+
- name: Check files
33+
run: ls built
34+
35+
- name: API report
36+
run: npm run api-prod
37+
38+
- name: Show report
39+
if: always()
40+
run: cat temp/mfm-js.api.md

Diff for: ‎.github/workflows/ci.yml

-34
This file was deleted.

Diff for: ‎.github/workflows/lint.yml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Lint
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
lint:
7+
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- name: Checkout
12+
uses: actions/checkout@v2
13+
14+
- name: Setup Node.js
15+
uses: actions/setup-node@v1
16+
with:
17+
node-version: 16.5.0
18+
19+
- name: Cache dependencies
20+
uses: actions/cache@v2
21+
with:
22+
path: ~/.npm
23+
key: npm-${{ hashFiles('package-lock.json') }}
24+
restore-keys: npm-
25+
26+
- name: Install dependencies
27+
run: npm ci
28+
29+
- name: Lint
30+
run: npm run lint

Diff for: ‎.github/workflows/test.yml

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
3+
4+
name: Test and coverage
5+
6+
on: [push, pull_request]
7+
8+
jobs:
9+
test:
10+
11+
runs-on: ubuntu-latest
12+
13+
strategy:
14+
matrix:
15+
node-version: [16.5.0]
16+
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v2
20+
21+
- name: Setup Node.js ${{ matrix.node-version }}
22+
uses: actions/setup-node@v1
23+
with:
24+
node-version: ${{ matrix.node-version }}
25+
26+
- name: Cache dependencies
27+
uses: actions/cache@v2
28+
with:
29+
path: ~/.npm
30+
key: npm-${{ hashFiles('package-lock.json') }}
31+
restore-keys: npm-
32+
33+
- name: Install dependencies
34+
run: npm ci
35+
36+
- name: Build
37+
run: npm run build
38+
39+
- name: Test
40+
run: npm test
41+
env:
42+
CI: true
43+
44+
- name: Upload Coverage
45+
uses: codecov/codecov-action@v1

Diff for: ‎.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
# npm
22
node_modules
3-
package-lock.json
43

54
# editor
65
.vscode
76

87
# app dir
98
built
109
temp
10+
11+
coverage
12+
13+
src/internal/parser.js

Diff for: ‎CHANGELOG.md

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<!--
2+
## 0.x.x (unreleased)
3+
4+
### Features
5+
6+
### Improvements
7+
8+
### Changes
9+
10+
### Bugfixes
11+
12+
-->
13+
14+
## 0.20.0
15+
16+
npm: https://www.npmjs.com/package/mfm-js/v/0.20.0
17+
18+
### Features
19+
- Add tag syntaxes of bold and strikethrough. (#76)
20+
- Supports whitelisting of MFM function names. (#77)
21+
22+
### Improvements
23+
- Mentions in the link label are parsed as text. (#66)
24+
- Add a property to the URL node indicating whether it was enclosed in `<>`. (#69)
25+
- Disallows `<` and `>` in hashtags. (#74)
26+
- Improves security.
27+
28+
### Changes
29+
- Abolished MFM function v1 syntax. (#79)
30+
31+
## 0.19.0
32+
33+
npm: https://www.npmjs.com/package/mfm-js/v/0.19.0
34+
35+
### Improvements
36+
- Ignores a blank line after quote lines. (#61)
37+
38+
## 0.18.0
39+
40+
npm: https://www.npmjs.com/package/mfm-js/v/0.18.0
41+
42+
### Improvements
43+
- Twemoji v13.1 is supported.
44+
45+
## 0.17.0
46+
47+
npm: https://www.npmjs.com/package/mfm-js/v/0.17.0
48+
49+
### Improvements
50+
- Improves syntax of inline code.
51+
- Improves syntax of url.
52+
- Improves syntax of hashtag.

0 commit comments

Comments
 (0)