Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create new type definition for 'is-url' #4013

Merged
merged 54 commits into from
Feb 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
7864949
Create new type definition for 'is-url'
acid-chicken Jan 27, 2019
5b89772
[Client] Resolve #3638
syuilo Jan 27, 2019
d15ea00
10.79.1
syuilo Jan 27, 2019
dc012dd
New translations ja-JP.yml (Korean)
syuilo Jan 27, 2019
8e918ac
Add missing semicolon
AyaMorisawa Jan 28, 2019
3a429c5
Remove file-loader from dependencies (#4025)
AyaMorisawa Jan 28, 2019
20fce6b
Update README.md [AUTOGEN] (#4028)
acid-chicken Jan 28, 2019
fd354fb
Update README.md [AUTOGEN] (#4030)
acid-chicken Jan 29, 2019
bb0e188
Add visibility test (#4029)
mei23 Jan 29, 2019
821c504
Update ws requirement from 6.1.2 to 6.1.3 (#4027)
dependabot[bot] Jan 29, 2019
7b5edbe
Module 'web-push' as import syntax (#4017)
acid-chicken Jan 29, 2019
260d1f4
Fix visibility test (#4031)
mei23 Jan 29, 2019
e9893bf
Upgrade gulp version to 4.0.0
AyaMorisawa Jan 29, 2019
33536b3
Prevent typescript errors from crashing
AyaMorisawa Jan 29, 2019
24e5593
Remove duplicated dependencies
AyaMorisawa Jan 29, 2019
428b8c8
Use parallel and task to specify dependencies
AyaMorisawa Jan 29, 2019
2b45ebc
Sort tasks by topological ordering
AyaMorisawa Jan 29, 2019
7b8fd89
リプライ/メンションされていれば非フォロワーへのフォロワー限定でも参照可能に (#4033)
mei23 Jan 29, 2019
2ed340a
New translations ja-JP.yml (Chinese Simplified)
syuilo Jan 29, 2019
2b8ae89
New translations ja-JP.yml (Chinese Simplified)
syuilo Jan 29, 2019
c21e894
Fix #4034 (#4037)
mei23 Jan 29, 2019
ca0a1aa
Module 'crypto' as import syntax (#4011)
acid-chicken Jan 30, 2019
94947ac
Extract MFM normalize function
AyaMorisawa Jan 30, 2019
1c9f282
Extract MFM types
AyaMorisawa Jan 30, 2019
7169e48
Rename html to toHtml
AyaMorisawa Jan 30, 2019
22a6826
Rename html-to-mfm to fromHtml
AyaMorisawa Jan 30, 2019
e8c68d1
Merge plainParser into mfm
AyaMorisawa Jan 30, 2019
2875c54
Extract parsePlain function
AyaMorisawa Jan 30, 2019
2d68c33
Rename analyze to parse in MFM tests
AyaMorisawa Jan 30, 2019
6dd1105
Update @types/mongodb requirement from 3.1.18 to 3.1.19 (#4041)
dependabot[bot] Jan 30, 2019
84debaa
Update vue-svg-inline-loader requirement from 1.2.7 to 1.2.10 (#4040)
dependabot[bot] Jan 30, 2019
a1a0479
Avoid export default
AyaMorisawa Jan 30, 2019
3787dd9
Rename parser to language
AyaMorisawa Jan 30, 2019
aa36c7f
Fix import
AyaMorisawa Jan 30, 2019
d70eb5e
Introduce silence (#4043)
syuilo Jan 30, 2019
d4f90d2
delete unnecessary key (#4045)
mei23 Jan 30, 2019
36a1845
Update CHANGELOG.md
syuilo Jan 30, 2019
c670de8
[ActivityPub] Use microformats on mentions
syuilo Jan 30, 2019
1a1ba58
Create type definition for '*/package.json' (#4014)
acid-chicken Jan 30, 2019
3746b1d
Update index.ts
acid-chicken Jan 30, 2019
c29d4e4
Create type definition for 'is-root' (#4001)
acid-chicken Jan 30, 2019
15bd08e
Fix path
acid-chicken Jan 30, 2019
ba40a8f
Re-fix path
acid-chicken Jan 30, 2019
fc05300
Do not import as pack from AP renderer (#4048)
mei23 Jan 30, 2019
02ffb21
Simplify MFM (#4046)
AyaMorisawa Jan 31, 2019
3645097
[MFM] Make some syntax block
syuilo Jan 31, 2019
c59d2c8
[MFM] Better syntax parsing
syuilo Jan 31, 2019
f6ac397
[Client] MFMの制限を緩和
syuilo Jan 31, 2019
053bd39
:art:
syuilo Jan 31, 2019
24e0ef8
Update CHANGELOG.md
syuilo Jan 31, 2019
a5d1999
10.80.0
syuilo Jan 31, 2019
5cc29c4
Merge branch 'develop' into types/is-url
acid-chicken Jan 31, 2019
9d6e733
Update is-url.d.ts
acid-chicken Jan 31, 2019
57a6375
Merge branch 'develop' into types/is-url
acid-chicken Feb 2, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
"@types/gulp-util": "3.0.34",
"@types/is-root": "1.0.0",
"@types/is-svg": "3.0.0",
"@types/is-url": "1.2.28",
"@types/js-yaml": "3.12.0",
"@types/katex": "0.5.0",
"@types/koa": "2.0.48",
Expand Down
7 changes: 7 additions & 0 deletions src/@types/is-url.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
declare module 'is-url' {
function isUrl(string: string): boolean;

namespace isUrl {} // Hack

export = isUrl;
}
2 changes: 1 addition & 1 deletion src/config/load.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import * as fs from 'fs';
import { URL } from 'url';
import * as yaml from 'js-yaml';
import { Source, Mixin } from './types';
import isUrl = require('is-url');
import * as isUrl from 'is-url';
import * as pkg from '../../package.json';

/**
Expand Down