2
0
Yuki Takei 4 жил өмнө
parent
commit
59fddae019

+ 1 - 0
packages/app/.eslintrc.js

@@ -1,6 +1,7 @@
 module.exports = {
   extends: [
     'weseek/react',
+    'weseek/typescript',
   ],
   env: {
     jquery: true,

+ 1 - 0
packages/app/src/server/models/attachment.js

@@ -11,6 +11,7 @@ const uniqueValidator = require('mongoose-unique-validator');
 const mongoosePaginate = require('mongoose-paginate-v2');
 const { addSeconds } = require('date-fns');
 
+// eslint-disable-next-line no-unused-vars
 const logger = loggerFactory('growi:models:attachment');
 
 const ObjectId = mongoose.Schema.Types.ObjectId;

+ 1 - 1
packages/app/src/server/routes/apiv3/app-settings.js

@@ -1,3 +1,4 @@
+import { body } from 'express-validator';
 import loggerFactory from '~/utils/logger';
 
 const logger = loggerFactory('growi:routes:apiv3:app-settings');
@@ -11,7 +12,6 @@ const { listLocaleIds } = require('~/utils/locale-utils');
 
 const router = express.Router();
 
-const { body } = require('express-validator');
 const ErrorV3 = require('../../models/vo/error-apiv3');
 
 /**

+ 4 - 5
packages/app/src/server/routes/apiv3/docs.js

@@ -1,8 +1,10 @@
 import loggerFactory from '~/utils/logger';
-
-const logger = loggerFactory('growi:routes:apiv3:docs'); // eslint-disable-line no-unused-vars
+import swaggerDefinition from '^/config/swagger-definition';
 
 const express = require('express');
+const swaggerJSDoc = require('swagger-jsdoc');
+
+const logger = loggerFactory('growi:routes:apiv3:docs'); // eslint-disable-line no-unused-vars
 
 const router = express.Router();
 
@@ -19,9 +21,6 @@ module.exports = (crowi) => {
     return router;
   }
 
-  const swaggerJSDoc = require('swagger-jsdoc');
-  const swaggerDefinition = require('@root/config/swagger-definition');
-
   // generate swagger spec
   const options = {
     swaggerDefinition,

+ 4 - 6
packages/app/src/server/routes/apiv3/personal-setting.js

@@ -1,19 +1,17 @@
-/* eslint-disable no-unused-vars */
+import { body } from 'express-validator';
+
 import loggerFactory from '~/utils/logger';
 
+import { listLocaleIds } from '~/utils/locale-utils';
+
 const logger = loggerFactory('growi:routes:apiv3:personal-setting');
 
 const express = require('express');
 
 const passport = require('passport');
 
-const { listLocaleIds } = require('~/utils/locale-utils');
-
 const router = express.Router();
 
-const { body } = require('express-validator');
-const ErrorV3 = require('../../models/vo/error-apiv3');
-
 /**
  * @swagger
  *  tags:

+ 1 - 1
packages/app/src/server/service/acl.js

@@ -1,6 +1,6 @@
 import loggerFactory from '~/utils/logger';
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
+// eslint-disable-next-line no-unused-vars
 const logger = loggerFactory('growi:service:AclService');
 
 /**

+ 0 - 1
packages/app/src/server/service/s2s-messaging/base.ts

@@ -7,7 +7,6 @@ import { S2sMessageHandlable } from './handlable';
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const logger = loggerFactory('growi:service:s2s-messaging:base');
 
-
 export interface S2sMessagingService {
 
   uid: number;

+ 2 - 2
packages/app/src/server/service/search.js

@@ -46,12 +46,12 @@ class SearchService {
 
     if (this.isSearchboxEnabled) {
       logger.info('Searchbox is enabled');
-      const SearchboxDelegator = require('./search-delegator/searchbox.js');
+      const SearchboxDelegator = require('./search-delegator/searchbox');
       return new SearchboxDelegator(this.configManager, this.crowi.socketIoService);
     }
     if (this.isElasticsearchEnabled) {
       logger.info('Elasticsearch (not Searchbox) is enabled');
-      const ElasticsearchDelegator = require('./search-delegator/elasticsearch.js');
+      const ElasticsearchDelegator = require('./search-delegator/elasticsearch');
       return new ElasticsearchDelegator(this.configManager, this.crowi.socketIoService);
     }
   }

+ 1 - 0
packages/app/src/server/util/middlewares.js

@@ -9,6 +9,7 @@ const pathUtils = require('growi-commons').pathUtils;
 const md5 = require('md5');
 const entities = require('entities');
 
+// eslint-disable-next-line no-unused-vars
 const logger = loggerFactory('growi:lib:middlewares');
 
 module.exports = (crowi) => {