summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAcid Chicken (硫酸鶏) <root@acid-chicken.com>2019-02-03 22:21:47 +0900
committerGitHub <noreply@github.com>2019-02-03 22:21:47 +0900
commitceda3dd72a5b4ebe01500d0a5e76a58699c878bc (patch)
treeac0995f5c02a6ff581be110092cfe8c743a83a12
parentCreate new type definition for 'is-url' (#4013) (diff)
downloadsharkey-ceda3dd72a5b4ebe01500d0a5e76a58699c878bc.tar.gz
sharkey-ceda3dd72a5b4ebe01500d0a5e76a58699c878bc.tar.bz2
sharkey-ceda3dd72a5b4ebe01500d0a5e76a58699c878bc.zip
Create new type definition for 'escape-regexp' (#4058)
-rw-r--r--src/@types/escape-regexp.d.ts7
-rw-r--r--src/server/api/endpoints/hashtags/search.ts2
-rw-r--r--src/server/api/endpoints/users/search.ts2
3 files changed, 9 insertions, 2 deletions
diff --git a/src/@types/escape-regexp.d.ts b/src/@types/escape-regexp.d.ts
new file mode 100644
index 0000000000..d68e6048a1
--- /dev/null
+++ b/src/@types/escape-regexp.d.ts
@@ -0,0 +1,7 @@
+declare module 'escape-regexp' {
+ function escapeRegExp(str: string): string;
+
+ namespace escapeRegExp {} // Hack
+
+ export = escapeRegExp;
+}
diff --git a/src/server/api/endpoints/hashtags/search.ts b/src/server/api/endpoints/hashtags/search.ts
index 4d753808d4..d8a2156357 100644
--- a/src/server/api/endpoints/hashtags/search.ts
+++ b/src/server/api/endpoints/hashtags/search.ts
@@ -1,7 +1,7 @@
import $ from 'cafy';
import Hashtag from '../../../../models/hashtag';
import define from '../../define';
-const escapeRegexp = require('escape-regexp');
+import * as escapeRegexp from 'escape-regexp';
export const meta = {
desc: {
diff --git a/src/server/api/endpoints/users/search.ts b/src/server/api/endpoints/users/search.ts
index 86b16dcbb1..b0a789c7d5 100644
--- a/src/server/api/endpoints/users/search.ts
+++ b/src/server/api/endpoints/users/search.ts
@@ -1,5 +1,5 @@
import $ from 'cafy';
-const escapeRegexp = require('escape-regexp');
+import * as escapeRegexp from 'escape-regexp';
import User, { pack, validateUsername, IUser } from '../../../../models/user';
import define from '../../define';