update ms to 3.0.0

This commit is contained in:
syuilo 2021-11-12 19:47:04 +09:00
parent 5e82064a7d
commit 9b876b30b2
33 changed files with 36 additions and 43 deletions

View file

@ -1,12 +0,0 @@
declare module 'ms' {
interface IMSOptions {
long: boolean;
}
function ms(value: string): number;
function ms(value: number, options?: IMSOptions): string;
namespace ms {} // Hack
export = ms;
}

View file

@ -135,7 +135,7 @@
"mfm-js": "0.20.0", "mfm-js": "0.20.0",
"misskey-js": "0.0.8", "misskey-js": "0.0.8",
"mocha": "8.4.0", "mocha": "8.4.0",
"ms": "2.1.3", "ms": "3.0.0-canary.1",
"multer": "1.4.3", "multer": "1.4.3",
"nested-property": "4.0.0", "nested-property": "4.0.0",
"node-fetch": "2.6.1", "node-fetch": "2.6.1",

View file

@ -2,7 +2,7 @@ import $ from 'cafy';
import define from '../../define'; import define from '../../define';
import Resolver from '@/remote/activitypub/resolver'; import Resolver from '@/remote/activitypub/resolver';
import { ApiError } from '../../error'; import { ApiError } from '../../error';
import * as ms from 'ms'; import ms from 'ms';
export const meta = { export const meta = {
tags: ['federation'], tags: ['federation'],

View file

@ -11,7 +11,7 @@ import { Note } from '@/models/entities/note';
import { User } from '@/models/entities/user'; import { User } from '@/models/entities/user';
import { fetchMeta } from '@/misc/fetch-meta'; import { fetchMeta } from '@/misc/fetch-meta';
import { isActor, isPost, getApId } from '@/remote/activitypub/type'; import { isActor, isPost, getApId } from '@/remote/activitypub/type';
import * as ms from 'ms'; import ms from 'ms';
export const meta = { export const meta = {
tags: ['federation'], tags: ['federation'],

View file

@ -1,6 +1,6 @@
import $ from 'cafy'; import $ from 'cafy';
import { ID } from '@/misc/cafy-id'; import { ID } from '@/misc/cafy-id';
import * as ms from 'ms'; import ms from 'ms';
import create from '@/services/blocking/create'; import create from '@/services/blocking/create';
import define from '../../define'; import define from '../../define';
import { ApiError } from '../../error'; import { ApiError } from '../../error';

View file

@ -1,6 +1,6 @@
import $ from 'cafy'; import $ from 'cafy';
import { ID } from '@/misc/cafy-id'; import { ID } from '@/misc/cafy-id';
import * as ms from 'ms'; import ms from 'ms';
import deleteBlocking from '@/services/blocking/delete'; import deleteBlocking from '@/services/blocking/delete';
import define from '../../define'; import define from '../../define';
import { ApiError } from '../../error'; import { ApiError } from '../../error';

View file

@ -1,4 +1,4 @@
import * as ms from 'ms'; import ms from 'ms';
import $ from 'cafy'; import $ from 'cafy';
import { ID } from '@/misc/cafy-id'; import { ID } from '@/misc/cafy-id';
import create from '@/services/drive/add-file'; import create from '@/services/drive/add-file';

View file

@ -1,6 +1,6 @@
import $ from 'cafy'; import $ from 'cafy';
import { ID } from '@/misc/cafy-id'; import { ID } from '@/misc/cafy-id';
import * as ms from 'ms'; import ms from 'ms';
import uploadFromUrl from '@/services/drive/upload-from-url'; import uploadFromUrl from '@/services/drive/upload-from-url';
import define from '../../../define'; import define from '../../../define';
import { DriveFiles } from '@/models/index'; import { DriveFiles } from '@/models/index';

View file

@ -1,6 +1,6 @@
import $ from 'cafy'; import $ from 'cafy';
import { ID } from '@/misc/cafy-id'; import { ID } from '@/misc/cafy-id';
import * as ms from 'ms'; import ms from 'ms';
import create from '@/services/following/create'; import create from '@/services/following/create';
import define from '../../define'; import define from '../../define';
import { ApiError } from '../../error'; import { ApiError } from '../../error';

View file

@ -1,6 +1,6 @@
import $ from 'cafy'; import $ from 'cafy';
import { ID } from '@/misc/cafy-id'; import { ID } from '@/misc/cafy-id';
import * as ms from 'ms'; import ms from 'ms';
import deleteFollowing from '@/services/following/delete'; import deleteFollowing from '@/services/following/delete';
import define from '../../define'; import define from '../../define';
import { ApiError } from '../../error'; import { ApiError } from '../../error';

View file

@ -1,5 +1,5 @@
import $ from 'cafy'; import $ from 'cafy';
import * as ms from 'ms'; import ms from 'ms';
import define from '../../../define'; import define from '../../../define';
import { ID } from '../../../../../misc/cafy-id'; import { ID } from '../../../../../misc/cafy-id';
import { DriveFiles, GalleryPosts } from '@/models/index'; import { DriveFiles, GalleryPosts } from '@/models/index';

View file

@ -1,5 +1,5 @@
import $ from 'cafy'; import $ from 'cafy';
import * as ms from 'ms'; import ms from 'ms';
import define from '../../../define'; import define from '../../../define';
import { ID } from '../../../../../misc/cafy-id'; import { ID } from '../../../../../misc/cafy-id';
import { DriveFiles, GalleryPosts } from '@/models/index'; import { DriveFiles, GalleryPosts } from '@/models/index';

View file

@ -1,6 +1,6 @@
import define from '../../define'; import define from '../../define';
import { createExportBlockingJob } from '@/queue/index'; import { createExportBlockingJob } from '@/queue/index';
import * as ms from 'ms'; import ms from 'ms';
export const meta = { export const meta = {
secure: true, secure: true,

View file

@ -1,6 +1,6 @@
import define from '../../define'; import define from '../../define';
import { createExportFollowingJob } from '@/queue/index'; import { createExportFollowingJob } from '@/queue/index';
import * as ms from 'ms'; import ms from 'ms';
export const meta = { export const meta = {
secure: true, secure: true,

View file

@ -1,6 +1,6 @@
import define from '../../define'; import define from '../../define';
import { createExportMuteJob } from '@/queue/index'; import { createExportMuteJob } from '@/queue/index';
import * as ms from 'ms'; import ms from 'ms';
export const meta = { export const meta = {
secure: true, secure: true,

View file

@ -1,6 +1,6 @@
import define from '../../define'; import define from '../../define';
import { createExportNotesJob } from '@/queue/index'; import { createExportNotesJob } from '@/queue/index';
import * as ms from 'ms'; import ms from 'ms';
export const meta = { export const meta = {
secure: true, secure: true,

View file

@ -1,6 +1,6 @@
import define from '../../define'; import define from '../../define';
import { createExportUserListsJob } from '@/queue/index'; import { createExportUserListsJob } from '@/queue/index';
import * as ms from 'ms'; import ms from 'ms';
export const meta = { export const meta = {
secure: true, secure: true,

View file

@ -2,7 +2,7 @@ import $ from 'cafy';
import { ID } from '@/misc/cafy-id'; import { ID } from '@/misc/cafy-id';
import define from '../../define'; import define from '../../define';
import { createImportBlockingJob } from '@/queue/index'; import { createImportBlockingJob } from '@/queue/index';
import * as ms from 'ms'; import ms from 'ms';
import { ApiError } from '../../error'; import { ApiError } from '../../error';
import { DriveFiles } from '@/models/index'; import { DriveFiles } from '@/models/index';

View file

@ -2,7 +2,7 @@ import $ from 'cafy';
import { ID } from '@/misc/cafy-id'; import { ID } from '@/misc/cafy-id';
import define from '../../define'; import define from '../../define';
import { createImportFollowingJob } from '@/queue/index'; import { createImportFollowingJob } from '@/queue/index';
import * as ms from 'ms'; import ms from 'ms';
import { ApiError } from '../../error'; import { ApiError } from '../../error';
import { DriveFiles } from '@/models/index'; import { DriveFiles } from '@/models/index';

View file

@ -2,7 +2,7 @@ import $ from 'cafy';
import { ID } from '@/misc/cafy-id'; import { ID } from '@/misc/cafy-id';
import define from '../../define'; import define from '../../define';
import { createImportMutingJob } from '@/queue/index'; import { createImportMutingJob } from '@/queue/index';
import * as ms from 'ms'; import ms from 'ms';
import { ApiError } from '../../error'; import { ApiError } from '../../error';
import { DriveFiles } from '@/models/index'; import { DriveFiles } from '@/models/index';

View file

@ -2,7 +2,7 @@ import $ from 'cafy';
import { ID } from '@/misc/cafy-id'; import { ID } from '@/misc/cafy-id';
import define from '../../define'; import define from '../../define';
import { createImportUserListsJob } from '@/queue/index'; import { createImportUserListsJob } from '@/queue/index';
import * as ms from 'ms'; import ms from 'ms';
import { ApiError } from '../../error'; import { ApiError } from '../../error';
import { DriveFiles } from '@/models/index'; import { DriveFiles } from '@/models/index';

View file

@ -3,7 +3,7 @@ import { publishMainStream } from '@/services/stream';
import define from '../../define'; import define from '../../define';
import rndstr from 'rndstr'; import rndstr from 'rndstr';
import config from '@/config/index'; import config from '@/config/index';
import * as ms from 'ms'; import ms from 'ms';
import * as bcrypt from 'bcryptjs'; import * as bcrypt from 'bcryptjs';
import { Users, UserProfiles } from '@/models/index'; import { Users, UserProfiles } from '@/models/index';
import { sendEmail } from '@/services/send-email'; import { sendEmail } from '@/services/send-email';

View file

@ -1,7 +1,7 @@
import $ from 'cafy'; import $ from 'cafy';
import { ID } from '@/misc/cafy-id'; import { ID } from '@/misc/cafy-id';
import define from '../../../define'; import define from '../../../define';
import * as ms from 'ms'; import ms from 'ms';
import { ApiError } from '../../../error'; import { ApiError } from '../../../error';
import { MessagingMessages } from '@/models/index'; import { MessagingMessages } from '@/models/index';
import { deleteMessage } from '@/services/messages/delete'; import { deleteMessage } from '@/services/messages/delete';

View file

@ -1,5 +1,5 @@
import $ from 'cafy'; import $ from 'cafy';
import * as ms from 'ms'; import ms from 'ms';
import { length } from 'stringz'; import { length } from 'stringz';
import create from '@/services/note/create'; import create from '@/services/note/create';
import define from '../../define'; import define from '../../define';

View file

@ -2,7 +2,7 @@ import $ from 'cafy';
import { ID } from '@/misc/cafy-id'; import { ID } from '@/misc/cafy-id';
import deleteNote from '@/services/note/delete'; import deleteNote from '@/services/note/delete';
import define from '../../define'; import define from '../../define';
import * as ms from 'ms'; import ms from 'ms';
import { getNote } from '../../common/getters'; import { getNote } from '../../common/getters';
import { ApiError } from '../../error'; import { ApiError } from '../../error';
import { Users } from '@/models/index'; import { Users } from '@/models/index';

View file

@ -1,7 +1,7 @@
import $ from 'cafy'; import $ from 'cafy';
import { ID } from '@/misc/cafy-id'; import { ID } from '@/misc/cafy-id';
import define from '../../../define'; import define from '../../../define';
import * as ms from 'ms'; import ms from 'ms';
import deleteReaction from '@/services/note/reaction/delete'; import deleteReaction from '@/services/note/reaction/delete';
import { getNote } from '../../../common/getters'; import { getNote } from '../../../common/getters';
import { ApiError } from '../../../error'; import { ApiError } from '../../../error';

View file

@ -2,7 +2,7 @@ import $ from 'cafy';
import { ID } from '@/misc/cafy-id'; import { ID } from '@/misc/cafy-id';
import deleteNote from '@/services/note/delete'; import deleteNote from '@/services/note/delete';
import define from '../../define'; import define from '../../define';
import * as ms from 'ms'; import ms from 'ms';
import { getNote } from '../../common/getters'; import { getNote } from '../../common/getters';
import { ApiError } from '../../error'; import { ApiError } from '../../error';
import { Notes, Users } from '@/models/index'; import { Notes, Users } from '@/models/index';

View file

@ -1,5 +1,5 @@
import $ from 'cafy'; import $ from 'cafy';
import * as ms from 'ms'; import ms from 'ms';
import define from '../../define'; import define from '../../define';
import { ID } from '@/misc/cafy-id'; import { ID } from '@/misc/cafy-id';
import { Pages, DriveFiles } from '@/models/index'; import { Pages, DriveFiles } from '@/models/index';

View file

@ -1,5 +1,5 @@
import $ from 'cafy'; import $ from 'cafy';
import * as ms from 'ms'; import ms from 'ms';
import define from '../../define'; import define from '../../define';
import { ApiError } from '../../error'; import { ApiError } from '../../error';
import { Pages, DriveFiles } from '@/models/index'; import { Pages, DriveFiles } from '@/models/index';

View file

@ -3,7 +3,7 @@ import { publishMainStream } from '@/services/stream';
import define from '../define'; import define from '../define';
import rndstr from 'rndstr'; import rndstr from 'rndstr';
import config from '@/config/index'; import config from '@/config/index';
import * as ms from 'ms'; import ms from 'ms';
import { Users, UserProfiles, PasswordResetRequests } from '@/models/index'; import { Users, UserProfiles, PasswordResetRequests } from '@/models/index';
import { sendEmail } from '@/services/send-email'; import { sendEmail } from '@/services/send-email';
import { ApiError } from '../error'; import { ApiError } from '../error';

View file

@ -1,4 +1,4 @@
import * as ms from 'ms'; import ms from 'ms';
import $ from 'cafy'; import $ from 'cafy';
import define from '../../define'; import define from '../../define';
import { Users, Followings } from '@/models/index'; import { Users, Followings } from '@/models/index';

View file

@ -3,7 +3,7 @@
*/ */
import { dirname } from 'path'; import { dirname } from 'path';
import * as ms from 'ms'; import ms from 'ms';
import * as Koa from 'koa'; import * as Koa from 'koa';
import * as Router from '@koa/router'; import * as Router from '@koa/router';
import * as send from 'koa-send'; import * as send from 'koa-send';

View file

@ -5421,6 +5421,11 @@ ms@2.1.3, ms@^2.0.0, ms@^2.1.1:
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
ms@3.0.0-canary.1:
version "3.0.0-canary.1"
resolved "https://registry.yarnpkg.com/ms/-/ms-3.0.0-canary.1.tgz#c7b34fbce381492fd0b345d1cf56e14d67b77b80"
integrity sha512-kh8ARjh8rMN7Du2igDRO9QJnqCb2xYTJxyQYK7vJJS4TvLLmsbyhiKpSW+t+y26gyOyMd0riphX0GeWKU3ky5g==
multer@1.4.3: multer@1.4.3:
version "1.4.3" version "1.4.3"
resolved "https://registry.yarnpkg.com/multer/-/multer-1.4.3.tgz#4db352d6992e028ac0eacf7be45c6efd0264297b" resolved "https://registry.yarnpkg.com/multer/-/multer-1.4.3.tgz#4db352d6992e028ac0eacf7be45c6efd0264297b"