natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

uuid() と lint (#5288) 

* Import only v4 uuid, uuid() without version is deprecated

* Add Missing semicolon
This commit is contained in:
Satsuki Yanagi 2019-08-18 12:42:58 +09:00 committed by syuilo
parent 6060c6d56e
commit 59493a0cd9
21 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/@types/lookup-dns-cache.d.ts vendored
View File

@ -1,5 +1,5 @@
declare module 'lookup-dns-cache' { declare module 'lookup-dns-cache' {
import { LookupOneOptions, LookupAllOptions, LookupOptions, LookupAddress } from 'dns' import { LookupOneOptions, LookupAllOptions, LookupOptions, LookupAddress } from 'dns';
function lookup(hostname: string, family: number, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void; function lookup(hostname: string, family: number, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void;
function lookup(hostname: string, options: LookupOneOptions, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void; function lookup(hostname: string, options: LookupOneOptions, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void;

2
src/client/app/common/views/components/settings/tags.vue
View File

@ -16,7 +16,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import i18n from '../../../../i18n'; import i18n from '../../../../i18n';
import * as uuid from 'uuid'; import { v4 as uuid } from 'uuid';
export default Vue.extend({ export default Vue.extend({
i18n: i18n('desktop/views/components/settings.tags.vue'), i18n: i18n('desktop/views/components/settings.tags.vue'),

2
src/client/app/common/views/components/settings/theme.vue
View File

@ -125,7 +125,7 @@ import Vue from 'vue';
import i18n from '../../../../i18n'; import i18n from '../../../../i18n';
import { lightTheme, darkTheme, builtinThemes, applyTheme, Theme } from '../../../../theme'; import { lightTheme, darkTheme, builtinThemes, applyTheme, Theme } from '../../../../theme';
import { Chrome } from 'vue-color'; import { Chrome } from 'vue-color';
import * as uuid from 'uuid'; import { v4 as uuid } from 'uuid';
import * as tinycolor from 'tinycolor2'; import * as tinycolor from 'tinycolor2';
import * as JSON5 from 'json5'; import * as JSON5 from 'json5';
import { faMoon, faSun } from '@fortawesome/free-regular-svg-icons'; import { faMoon, faSun } from '@fortawesome/free-regular-svg-icons';

2
src/client/app/common/views/components/trends.chart.vue
View File

@ -31,7 +31,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import * as uuid from 'uuid'; import { v4 as uuid } from 'uuid';
export default Vue.extend({ export default Vue.extend({
props: { props: {

2
src/client/app/common/views/deck/deck.vue
View File

@ -21,7 +21,7 @@ import i18n from '../../../i18n';
import XColumnCore from './deck.column-core.vue'; import XColumnCore from './deck.column-core.vue';
import Menu from '../../../common/views/components/menu.vue'; import Menu from '../../../common/views/components/menu.vue';
import * as uuid from 'uuid'; import { v4 as uuid } from 'uuid';
export default Vue.extend({ export default Vue.extend({
i18n: i18n('deck'), i18n: i18n('deck'),

2
src/client/app/common/views/deck/deck.widgets-column.vue
View File

@ -54,7 +54,7 @@ import Vue from 'vue';
import i18n from '../../../i18n'; import i18n from '../../../i18n';
import XColumn from './deck.column.vue'; import XColumn from './deck.column.vue';
import * as XDraggable from 'vuedraggable'; import * as XDraggable from 'vuedraggable';
import * as uuid from 'uuid'; import { v4 as uuid } from 'uuid';
export default Vue.extend({ export default Vue.extend({
i18n: i18n(), i18n: i18n(),

4
src/client/app/common/views/pages/page-editor/els/page-editor.el.if.vue
View File

@ -26,7 +26,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import * as uuid from 'uuid'; import { v4 as uuid } from 'uuid';
import { faPlus, faQuestion } from '@fortawesome/free-solid-svg-icons'; import { faPlus, faQuestion } from '@fortawesome/free-solid-svg-icons';
import i18n from '../../../../../i18n'; import i18n from '../../../../../i18n';
import XContainer from '../page-editor.container.vue'; import XContainer from '../page-editor.container.vue';
@ -76,7 +76,7 @@ export default Vue.extend({
}); });
if (canceled) return; if (canceled) return;
const id = uuid.v4(); const id = uuid();
this.value.children.push({ id, type }); this.value.children.push({ id, type });
}, },
} }

4
src/client/app/common/views/pages/page-editor/els/page-editor.el.section.vue
View File

@ -18,7 +18,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import * as uuid from 'uuid'; import { v4 as uuid } from 'uuid';
import { faPlus, faPencilAlt } from '@fortawesome/free-solid-svg-icons'; import { faPlus, faPencilAlt } from '@fortawesome/free-solid-svg-icons';
import { faStickyNote } from '@fortawesome/free-regular-svg-icons'; import { faStickyNote } from '@fortawesome/free-regular-svg-icons';
import i18n from '../../../../../i18n'; import i18n from '../../../../../i18n';
@ -88,7 +88,7 @@ export default Vue.extend({
}); });
if (canceled) return; if (canceled) return;
const id = uuid.v4(); const id = uuid();
this.value.children.push({ id, type }); this.value.children.push({ id, type });
}, },
} }

8
src/client/app/common/views/pages/page-editor/page-editor.script-block.vue
View File

@ -58,7 +58,7 @@ import i18n from '../../../../i18n';
import XContainer from './page-editor.container.vue'; import XContainer from './page-editor.container.vue';
import { faPencilAlt, faPlug } from '@fortawesome/free-solid-svg-icons'; import { faPencilAlt, faPlug } from '@fortawesome/free-solid-svg-icons';
import { isLiteralBlock, funcDefs, blockDefs } from '../../../../../../misc/aiscript/index'; import { isLiteralBlock, funcDefs, blockDefs } from '../../../../../../misc/aiscript/index';
import * as uuid from 'uuid'; import { v4 as uuid } from 'uuid';
export default Vue.extend({ export default Vue.extend({
i18n: i18n('pages'), i18n: i18n('pages'),
@ -143,7 +143,7 @@ export default Vue.extend({
this.warn = null; this.warn = null;
if (this.value.type === 'fn') { if (this.value.type === 'fn') {
const id = uuid.v4(); const id = uuid();
this.value.value = {}; this.value.value = {};
Vue.set(this.value.value, 'slots', []); Vue.set(this.value.value, 'slots', []);
Vue.set(this.value.value, 'expression', { id, type: null }); Vue.set(this.value.value, 'expression', { id, type: null });
@ -156,7 +156,7 @@ export default Vue.extend({
const empties = []; const empties = [];
for (let i = 0; i < fn.value.slots.length; i++) { for (let i = 0; i < fn.value.slots.length; i++) {
const id = uuid.v4(); const id = uuid();
empties.push({ id, type: null }); empties.push({ id, type: null });
} }
Vue.set(this.value, 'args', empties); Vue.set(this.value, 'args', empties);
@ -167,7 +167,7 @@ export default Vue.extend({
const empties = []; const empties = [];
for (let i = 0; i < funcDefs[this.value.type].in.length; i++) { for (let i = 0; i < funcDefs[this.value.type].in.length; i++) {
const id = uuid.v4(); const id = uuid();
empties.push({ id, type: null }); empties.push({ id, type: null });
} }
Vue.set(this.value, 'args', empties); Vue.set(this.value, 'args', empties);

8
src/client/app/common/views/pages/page-editor/page-editor.vue
View File

@ -99,7 +99,7 @@ import { faSave, faStickyNote, faTrashAlt } from '@fortawesome/free-regular-svg-
import i18n from '../../../../i18n'; import i18n from '../../../../i18n';
import XVariable from './page-editor.script-block.vue'; import XVariable from './page-editor.script-block.vue';
import XBlocks from './page-editor.blocks.vue'; import XBlocks from './page-editor.blocks.vue';
import * as uuid from 'uuid'; import { v4 as uuid } from 'uuid';
import { blockDefs } from '../../../../../../misc/aiscript/index'; import { blockDefs } from '../../../../../../misc/aiscript/index';
import { ASTypeChecker } from '../../../../../../misc/aiscript/type-checker'; import { ASTypeChecker } from '../../../../../../misc/aiscript/type-checker';
import { url } from '../../../../config'; import { url } from '../../../../config';
@ -201,7 +201,7 @@ export default Vue.extend({
this.variables = this.page.variables; this.variables = this.page.variables;
this.eyeCatchingImageId = this.page.eyeCatchingImageId; this.eyeCatchingImageId = this.page.eyeCatchingImageId;
} else { } else {
const id = uuid.v4(); const id = uuid();
this.content = [{ this.content = [{
id, id,
type: 'text', type: 'text',
@ -292,7 +292,7 @@ export default Vue.extend({
}); });
if (canceled) return; if (canceled) return;
const id = uuid.v4(); const id = uuid();
this.content.push({ id, type }); this.content.push({ id, type });
}, },
@ -316,7 +316,7 @@ export default Vue.extend({
return; return;
} }
const id = uuid.v4(); const id = uuid();
this.variables.push({ id, name, type: null }); this.variables.push({ id, name, type: null });
}, },

2
src/client/app/common/views/widgets/posts-monitor.vue
View File

@ -71,7 +71,7 @@
<script lang="ts"> <script lang="ts">
import define from '../../../common/define-widget'; import define from '../../../common/define-widget';
import i18n from '../../../i18n'; import i18n from '../../../i18n';
import * as uuid from 'uuid'; import { v4 as uuid } from 'uuid';
export default define({ export default define({
name: 'posts-monitor', name: 'posts-monitor',

2
src/client/app/common/views/widgets/server.cpu-memory.vue
View File

@ -63,7 +63,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import * as uuid from 'uuid'; import { v4 as uuid } from 'uuid';
export default Vue.extend({ export default Vue.extend({
props: ['connection'], props: ['connection'],

2
src/client/app/desktop/views/home/home.vue
View File

@ -79,7 +79,7 @@
import Vue from 'vue'; import Vue from 'vue';
import i18n from '../../../i18n'; import i18n from '../../../i18n';
import * as XDraggable from 'vuedraggable'; import * as XDraggable from 'vuedraggable';
import * as uuid from 'uuid'; import { v4 as uuid } from 'uuid';
import XWelcome from '../pages/welcome.vue'; import XWelcome from '../pages/welcome.vue';
export default Vue.extend({ export default Vue.extend({

2
src/client/app/mios.ts
View File

@ -1,7 +1,7 @@
import autobind from 'autobind-decorator'; import autobind from 'autobind-decorator';
import Vue from 'vue'; import Vue from 'vue';
import { EventEmitter } from 'eventemitter3'; import { EventEmitter } from 'eventemitter3';
import * as uuid from 'uuid'; import { v4 as uuid } from 'uuid';
import initStore from './store'; import initStore from './store';
import { apiUrl, version, locale } from './config'; import { apiUrl, version, locale } from './config';

2
src/client/app/mobile/views/pages/widgets.vue
View File

@ -54,7 +54,7 @@
import Vue from 'vue'; import Vue from 'vue';
import i18n from '../../../i18n'; import i18n from '../../../i18n';
import * as XDraggable from 'vuedraggable'; import * as XDraggable from 'vuedraggable';
import * as uuid from 'uuid'; import { v4 as uuid } from 'uuid';
export default Vue.extend({ export default Vue.extend({
i18n: i18n('mobile/views/pages/widgets.vue'), i18n: i18n('mobile/views/pages/widgets.vue'),

4
src/remote/activitypub/renderer/index.ts
View File

@ -1,11 +1,11 @@
import config from '../../../config'; import config from '../../../config';
import * as uuid from 'uuid'; import { v4 as uuid } from 'uuid';
export const renderActivity = (x: any) => { export const renderActivity = (x: any) => {
if (x == null) return null; if (x == null) return null;
if (x !== null && typeof x === 'object' && x.id == null) { if (x !== null && typeof x === 'object' && x.id == null) {
x.id = `${config.url}/${uuid.v4()}`; x.id = `${config.url}/${uuid()}`;
} }
return Object.assign({ return Object.assign({

4
src/server/api/endpoints/auth/session/generate.ts
View File

@ -1,4 +1,4 @@
import * as uuid from 'uuid'; import { v4 as uuid } from 'uuid';
import $ from 'cafy'; import $ from 'cafy';
import config from '../../../../../config'; import config from '../../../../../config';
import define from '../../../define'; import define from '../../../define';
@ -64,7 +64,7 @@ export default define(meta, async (ps) => {
} }
// Generate token // Generate token
const token = uuid.v4(); const token = uuid();
// Create session token document // Create session token document
const doc = await AuthSessions.save({ const doc = await AuthSessions.save({

2
src/server/api/service/discord.ts
View File

@ -5,7 +5,7 @@ import { OAuth2 } from 'oauth';
import config from '../../../config'; import config from '../../../config';
import { publishMainStream } from '../../../services/stream'; import { publishMainStream } from '../../../services/stream';
import redis from '../../../db/redis'; import redis from '../../../db/redis';
import * as uuid from 'uuid'; import { v4 as uuid } from 'uuid';
import signin from '../common/signin'; import signin from '../common/signin';
import { fetchMeta } from '../../../misc/fetch-meta'; import { fetchMeta } from '../../../misc/fetch-meta';
import { Users, UserProfiles } from '../../../models'; import { Users, UserProfiles } from '../../../models';

2
src/server/api/service/github.ts
View File

@ -5,7 +5,7 @@ import { OAuth2 } from 'oauth';
import config from '../../../config'; import config from '../../../config';
import { publishMainStream } from '../../../services/stream'; import { publishMainStream } from '../../../services/stream';
import redis from '../../../db/redis'; import redis from '../../../db/redis';
import * as uuid from 'uuid'; import { v4 as uuid } from 'uuid';
import signin from '../common/signin'; import signin from '../common/signin';
import { fetchMeta } from '../../../misc/fetch-meta'; import { fetchMeta } from '../../../misc/fetch-meta';
import { Users, UserProfiles } from '../../../models'; import { Users, UserProfiles } from '../../../models';

2
src/server/api/service/twitter.ts
View File

@ -1,6 +1,6 @@
import * as Koa from 'koa'; import * as Koa from 'koa';
import * as Router from 'koa-router'; import * as Router from 'koa-router';
import * as uuid from 'uuid'; import { v4 as uuid } from 'uuid';
import autwh from 'autwh'; import autwh from 'autwh';
import redis from '../../../db/redis'; import redis from '../../../db/redis';
import { publishMainStream } from '../../../services/stream'; import { publishMainStream } from '../../../services/stream';

14
src/services/drive/add-file.ts
View File

@ -2,7 +2,7 @@ import { Buffer } from 'buffer';
import * as fs from 'fs'; import * as fs from 'fs';
import * as crypto from 'crypto'; import * as crypto from 'crypto';
import * as uuid from 'uuid'; import { v4 as uuid } from 'uuid';
import * as sharp from 'sharp'; import * as sharp from 'sharp';
import { publishMainStream, publishDriveStream } from '../stream'; import { publishMainStream, publishDriveStream } from '../stream';
@ -55,7 +55,7 @@ async function save(file: DriveFile, path: string, name: string, type: string, h
|| `${ meta.objectStorageUseSSL ? 'https' : 'http' }://${ meta.objectStorageEndpoint }${ meta.objectStoragePort ? `:${meta.objectStoragePort}` : '' }/${ meta.objectStorageBucket }`; || `${ meta.objectStorageUseSSL ? 'https' : 'http' }://${ meta.objectStorageEndpoint }${ meta.objectStoragePort ? `:${meta.objectStoragePort}` : '' }/${ meta.objectStorageBucket }`;
// for original // for original
const key = `${meta.objectStoragePrefix}/${uuid.v4()}${ext}`; const key = `${meta.objectStoragePrefix}/${uuid()}${ext}`;
const url = `${ baseUrl }/${ key }`; const url = `${ baseUrl }/${ key }`;
// for alts // for alts
@ -72,7 +72,7 @@ async function save(file: DriveFile, path: string, name: string, type: string, h
]; ];
if (alts.webpublic) { if (alts.webpublic) {
webpublicKey = `${meta.objectStoragePrefix}/webpublic-${uuid.v4()}.${alts.webpublic.ext}`; webpublicKey = `${meta.objectStoragePrefix}/webpublic-${uuid()}.${alts.webpublic.ext}`;
webpublicUrl = `${ baseUrl }/${ webpublicKey }`; webpublicUrl = `${ baseUrl }/${ webpublicKey }`;
logger.info(`uploading webpublic: ${webpublicKey}`); logger.info(`uploading webpublic: ${webpublicKey}`);
@ -80,7 +80,7 @@ async function save(file: DriveFile, path: string, name: string, type: string, h
} }
if (alts.thumbnail) { if (alts.thumbnail) {
thumbnailKey = `${meta.objectStoragePrefix}/thumbnail-${uuid.v4()}.${alts.thumbnail.ext}`; thumbnailKey = `${meta.objectStoragePrefix}/thumbnail-${uuid()}.${alts.thumbnail.ext}`;
thumbnailUrl = `${ baseUrl }/${ thumbnailKey }`; thumbnailUrl = `${ baseUrl }/${ thumbnailKey }`;
logger.info(`uploading thumbnail: ${thumbnailKey}`); logger.info(`uploading thumbnail: ${thumbnailKey}`);
@ -104,9 +104,9 @@ async function save(file: DriveFile, path: string, name: string, type: string, h
return await DriveFiles.save(file); return await DriveFiles.save(file);
} else { // use internal storage } else { // use internal storage
const accessKey = uuid.v4(); const accessKey = uuid();
const thumbnailAccessKey = 'thumbnail-' + uuid.v4(); const thumbnailAccessKey = 'thumbnail-' + uuid();
const webpublicAccessKey = 'webpublic-' + uuid.v4(); const webpublicAccessKey = 'webpublic-' + uuid();
const url = InternalStorage.saveFromPath(accessKey, path); const url = InternalStorage.saveFromPath(accessKey, path);