Просмотр исходного кода

Merge pull request #5689 from weseek/support/reorganize-import-order

support: Reorganize import order
Yuki Takei 4 лет назад
Родитель
Сommit
3242945541
54 измененных файлов с 134 добавлено и 114 удалено
  1. 6 0
      .eslintrc.js
  2. 2 2
      packages/codemirror-textlint/src/index.ts
  3. 2 2
      packages/core/src/index.js
  4. 1 1
      packages/core/src/test/plugin/service/tag-cache-manager.test.js
  5. 1 0
      packages/core/src/utils/page-path-utils.ts
  6. 1 1
      packages/plugin-attachment-refs/src/client-entry.js
  7. 4 5
      packages/plugin-attachment-refs/src/client/js/components/AttachmentList.jsx
  8. 1 2
      packages/plugin-attachment-refs/src/client/js/components/ExtractedAttachments.jsx
  9. 3 3
      packages/plugin-attachment-refs/src/client/js/util/Interceptor/RefsPostRenderInterceptor.js
  10. 1 1
      packages/plugin-lsx/src/client-entry.js
  11. 4 4
      packages/plugin-lsx/src/client/js/components/Lsx.jsx
  12. 3 2
      packages/plugin-lsx/src/client/js/components/LsxPageList/LsxListView.jsx
  13. 2 3
      packages/plugin-lsx/src/client/js/components/LsxPageList/LsxPage.jsx
  14. 2 2
      packages/plugin-lsx/src/client/js/components/LsxPageList/PagePathWrapper.jsx
  15. 2 2
      packages/plugin-lsx/src/client/js/util/Interceptor/LsxPostRenderInterceptor.js
  16. 1 1
      packages/plugin-lsx/src/client/js/util/Interceptor/LsxPreRenderInterceptor.js
  17. 1 0
      packages/slack/src/interfaces/growi-interaction-processor.ts
  18. 2 1
      packages/slack/src/middlewares/parse-slack-interaction-request.ts
  19. 2 2
      packages/slack/src/middlewares/verify-growi-to-slack-request.ts
  20. 4 3
      packages/slack/src/middlewares/verify-slack-request.ts
  21. 4 3
      packages/slack/src/utils/check-communicable.ts
  22. 3 1
      packages/slack/src/utils/interaction-payload-accessor.ts
  23. 2 1
      packages/slack/src/utils/post-ephemeral-errors.ts
  24. 2 1
      packages/slack/src/utils/respond-util-factory.ts
  25. 8 7
      packages/slackbot-proxy/src/Server.ts
  26. 9 12
      packages/slackbot-proxy/src/controllers/growi-to-slack.ts
  27. 11 13
      packages/slackbot-proxy/src/controllers/slack.ts
  28. 1 2
      packages/slackbot-proxy/src/controllers/top.ts
  29. 1 1
      packages/slackbot-proxy/src/entities/installation.ts
  30. 1 0
      packages/slackbot-proxy/src/entities/order.ts
  31. 1 0
      packages/slackbot-proxy/src/entities/relation.ts
  32. 1 1
      packages/slackbot-proxy/src/interfaces/growi-to-slack/growi-req.ts
  33. 0 1
      packages/slackbot-proxy/src/middlewares/GlobalHttpErrorHandlingMiddleware.ts
  34. 0 2
      packages/slackbot-proxy/src/middlewares/slack-to-growi/authorizer.ts
  35. 1 1
      packages/slackbot-proxy/src/middlewares/slack-to-growi/extract-growi-uri-from-req.ts
  36. 1 2
      packages/slackbot-proxy/src/middlewares/slack-to-growi/join-to-conversation.ts
  37. 1 2
      packages/slackbot-proxy/src/middlewares/slack-to-growi/parse-interaction-req.ts
  38. 1 0
      packages/slackbot-proxy/src/middlewares/slack-to-growi/url-verification.ts
  39. 0 1
      packages/slackbot-proxy/src/models/errors.ts
  40. 4 3
      packages/slackbot-proxy/src/services/LinkSharedService.ts
  41. 9 6
      packages/slackbot-proxy/src/services/RegisterService.ts
  42. 3 5
      packages/slackbot-proxy/src/services/RelationsService.ts
  43. 2 2
      packages/slackbot-proxy/src/services/SelectGrowiService.ts
  44. 2 2
      packages/slackbot-proxy/src/services/SystemInformationService.ts
  45. 5 4
      packages/slackbot-proxy/src/services/UnregisterService.ts
  46. 2 0
      packages/slackbot-proxy/src/services/growi-uri-injector/ActionsBlockPayloadDelegator.ts
  47. 2 0
      packages/slackbot-proxy/src/services/growi-uri-injector/SectionBlockPayloadDelegator.ts
  48. 1 0
      packages/slackbot-proxy/src/services/growi-uri-injector/ViewInteractionPayloadDelegator.ts
  49. 1 0
      packages/slackbot-proxy/src/services/growi-uri-injector/block-elements/ButtonActionPayloadDelegator.ts
  50. 1 0
      packages/slackbot-proxy/src/services/growi-uri-injector/block-elements/CheckboxesActionPayloadDelegator.ts
  51. 1 1
      packages/slackbot-proxy/src/utils/welcome-message.ts
  52. 2 0
      packages/ui/src/components/Attachment/Attachment.jsx
  53. 3 1
      packages/ui/src/components/PagePath/PageListMeta.tsx
  54. 3 2
      packages/ui/src/components/User/UserPicture.jsx

+ 6 - 0
.eslintrc.js

@@ -20,6 +20,11 @@ module.exports = {
       'warn',
       {
         pathGroups: [
+          {
+            pattern: 'react',
+            group: 'builtin',
+            position: 'before',
+          },
           {
             pattern: '^/**',
             group: 'parent',
@@ -34,6 +39,7 @@ module.exports = {
         alphabetize: {
           order: 'asc',
         },
+        pathGroupsExcludedImportTypes: ['react'],
         'newlines-between': 'always',
       },
     ],

+ 2 - 2
packages/codemirror-textlint/src/index.ts

@@ -1,6 +1,7 @@
+import textlintRuleNoUnmatchedPair from '@textlint-rule/textlint-rule-no-unmatched-pair';
 import { TextlintKernel, TextlintKernelRule, TextlintRuleOptions } from '@textlint/kernel';
+import { AsyncLinter, Annotation } from 'codemirror/addon/lint/lint';
 import textlintToCodeMirror from 'textlint-message-to-codemirror';
-import textlintRuleNoUnmatchedPair from '@textlint-rule/textlint-rule-no-unmatched-pair';
 import textlintRuleCommonMisspellings from 'textlint-rule-common-misspellings';
 import textlintRuleDateWeekdayMismatch from 'textlint-rule-date-weekday-mismatch';
 // import textlintRuleEnCapitalization from 'textlint-rule-en-capitalization';  // omit because en-pos package is too big
@@ -28,7 +29,6 @@ import textlintRulePreferTariTari from 'textlint-rule-prefer-tari-tari';
 import textlintRuleSentenceLength from 'textlint-rule-sentence-length';
 import textlintRuleUseSiUnits from 'textlint-rule-use-si-units';
 
-import { AsyncLinter, Annotation } from 'codemirror/addon/lint/lint';
 import { loggerFactory } from './utils/logger';
 
 type RulesConfigObj = {

+ 2 - 2
packages/core/src/index.js

@@ -1,9 +1,9 @@
-import * as _pathUtils from './utils/path-utils';
+import * as _customTagUtils from './plugin/util/custom-tag-utils';
 import * as _envUtils from './utils/env-utils';
 import * as _pagePathUtils from './utils/page-path-utils';
 import * as _pageUtils from './utils/page-utils';
+import * as _pathUtils from './utils/path-utils';
 import * as _templateChecker from './utils/template-checker';
-import * as _customTagUtils from './plugin/util/custom-tag-utils';
 
 // export utils
 export const pathUtils = _pathUtils;

+ 1 - 1
packages/core/src/test/plugin/service/tag-cache-manager.test.js

@@ -3,8 +3,8 @@
 // import each from 'jest-each';
 jest.mock('~/service/localstorage-manager');
 
-import LocalStorageManager from '~/service/localstorage-manager';
 import TagCacheManager from '~/plugin/service/tag-cache-manager';
+import LocalStorageManager from '~/service/localstorage-manager';
 /* eslint-enable import/first */
 
 describe('TagCacheManager.constructor', () => {

+ 1 - 0
packages/core/src/utils/page-path-utils.ts

@@ -1,6 +1,7 @@
 import nodePath from 'path';
 
 import escapeStringRegexp from 'escape-string-regexp';
+
 import { addTrailingSlash } from './path-utils';
 
 /**

+ 1 - 1
packages/plugin-attachment-refs/src/client-entry.js

@@ -1,5 +1,5 @@
-import RefsPreRenderInterceptor from './client/js/util/Interceptor/RefsPreRenderInterceptor';
 import RefsPostRenderInterceptor from './client/js/util/Interceptor/RefsPostRenderInterceptor';
+import RefsPreRenderInterceptor from './client/js/util/Interceptor/RefsPreRenderInterceptor';
 
 export default (appContainer) => {
   // add interceptors

+ 4 - 5
packages/plugin-attachment-refs/src/client/js/components/AttachmentList.jsx

@@ -1,16 +1,15 @@
-import React from 'react';
+import { Attachment } from '@growi/ui';
+import axios from 'axios'; // import axios from growi dependencies
 import PropTypes from 'prop-types';
+import React from 'react';
 
 // eslint-disable-next-line import/no-unresolved
-import axios from 'axios'; // import axios from growi dependencies
-
-import { Attachment } from '@growi/ui';
 
+import styles from '../../css/index.css';
 import RefsContext from '../util/RefsContext';
 import TagCacheManagerFactory from '../util/TagCacheManagerFactory';
 
 // eslint-disable-next-line no-unused-vars
-import styles from '../../css/index.css';
 
 import ExtractedAttachments from './ExtractedAttachments';
 

+ 1 - 2
packages/plugin-attachment-refs/src/client/js/components/ExtractedAttachments.jsx

@@ -1,6 +1,5 @@
-import React from 'react';
 import PropTypes from 'prop-types';
-
+import React from 'react';
 import Carousel, { Modal, ModalGateway } from 'react-images';
 
 import RefsContext from '../util/RefsContext';

+ 3 - 3
packages/plugin-attachment-refs/src/client/js/util/Interceptor/RefsPostRenderInterceptor.js

@@ -1,12 +1,12 @@
+import { BasicInterceptor } from '@growi/core';
 import React from 'react';
 import ReactDOM from 'react-dom';
 
-import { BasicInterceptor } from '@growi/core';
 
-import RefsContext from '../RefsContext';
+import AttachmentList from '../../components/AttachmentList';
 import GalleryContext from '../GalleryContext';
+import RefsContext from '../RefsContext';
 
-import AttachmentList from '../../components/AttachmentList';
 
 /**
  * The interceptor for refs

+ 1 - 1
packages/plugin-lsx/src/client-entry.js

@@ -1,6 +1,6 @@
 import { LsxLogoutInterceptor } from './client/js/util/Interceptor/LsxLogoutInterceptor';
-import { LsxPreRenderInterceptor } from './client/js/util/Interceptor/LsxPreRenderInterceptor';
 import { LsxPostRenderInterceptor } from './client/js/util/Interceptor/LsxPostRenderInterceptor';
+import { LsxPreRenderInterceptor } from './client/js/util/Interceptor/LsxPreRenderInterceptor';
 
 export default (appContainer) => {
   // add interceptors

+ 4 - 4
packages/plugin-lsx/src/client/js/components/Lsx.jsx

@@ -1,17 +1,17 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 
 import * as url from 'url';
 
 import { pathUtils } from '@growi/core';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 // eslint-disable-next-line no-unused-vars
 import styles from '../../css/index.css';
-
 import { LsxContext } from '../util/LsxContext';
 import { TagCacheManagerFactory } from '../util/TagCacheManagerFactory';
-import { PageNode } from './PageNode';
+
 import { LsxListView } from './LsxPageList/LsxListView';
+import { PageNode } from './PageNode';
 
 export class Lsx extends React.Component {
 

+ 3 - 2
packages/plugin-lsx/src/client/js/components/LsxPageList/LsxListView.jsx

@@ -1,8 +1,9 @@
-import React from 'react';
 import PropTypes from 'prop-types';
+import React from 'react';
 
-import { PageNode } from '../PageNode';
 import { LsxContext } from '../../util/LsxContext';
+import { PageNode } from '../PageNode';
+
 import { LsxPage } from './LsxPage';
 
 export class LsxListView extends React.Component {

+ 2 - 3
packages/plugin-lsx/src/client/js/components/LsxPageList/LsxPage.jsx

@@ -1,9 +1,8 @@
-import React from 'react';
-import PropTypes from 'prop-types';
 
 import { pathUtils } from '@growi/core';
-
 import { PageListMeta } from '@growi/ui';
+import PropTypes from 'prop-types';
+import React from 'react';
 
 import { LsxContext } from '../../util/LsxContext';
 import { PageNode } from '../PageNode';

+ 2 - 2
packages/plugin-lsx/src/client/js/components/LsxPageList/PagePathWrapper.jsx

@@ -1,7 +1,7 @@
-import React from 'react';
+import { PagePathLabel } from '@growi/ui';
 import PropTypes from 'prop-types';
+import React from 'react';
 
-import { PagePathLabel } from '@growi/ui';
 
 export class PagePathWrapper extends React.Component {
 

+ 2 - 2
packages/plugin-lsx/src/client/js/util/Interceptor/LsxPostRenderInterceptor.js

@@ -1,10 +1,10 @@
+import { BasicInterceptor } from '@growi/core';
 import React from 'react';
 import ReactDOM from 'react-dom';
 
-import { BasicInterceptor } from '@growi/core';
 
-import { LsxContext } from '../LsxContext';
 import { Lsx } from '../../components/Lsx';
+import { LsxContext } from '../LsxContext';
 
 /**
  * The interceptor for lsx

+ 1 - 1
packages/plugin-lsx/src/client/js/util/Interceptor/LsxPreRenderInterceptor.js

@@ -1,5 +1,5 @@
-import ReactDOM from 'react-dom';
 import { customTagUtils, BasicInterceptor } from '@growi/core';
+import ReactDOM from 'react-dom';
 
 /**
  * The interceptor for lsx

+ 1 - 0
packages/slack/src/interfaces/growi-interaction-processor.ts

@@ -1,4 +1,5 @@
 import { AuthorizeResult } from '@slack/oauth';
+
 import { InteractionPayloadAccessor } from '../utils/interaction-payload-accessor';
 
 

+ 2 - 1
packages/slack/src/middlewares/parse-slack-interaction-request.ts

@@ -1,7 +1,8 @@
 import { Response, NextFunction } from 'express';
-import { InteractionPayloadAccessor } from '../utils/interaction-payload-accessor';
 
 import { RequestFromSlack } from '../interfaces/request-from-slack';
+import { InteractionPayloadAccessor } from '../utils/interaction-payload-accessor';
+
 
 export const parseSlackInteractionRequest = (req: RequestFromSlack, res: Response, next: NextFunction): Record<string, any> | void => {
   // There is no payload in the request from slack

+ 2 - 2
packages/slack/src/middlewares/verify-growi-to-slack-request.ts

@@ -1,8 +1,8 @@
 import { Response, NextFunction } from 'express';
-
 import createError from 'http-errors';
-import loggerFactory from '../utils/logger';
+
 import { RequestFromGrowi } from '../interfaces/request-between-growi-and-proxy';
+import loggerFactory from '../utils/logger';
 
 const logger = loggerFactory('@growi/slack:middlewares:verify-growi-to-slack-request');
 

+ 4 - 3
packages/slack/src/middlewares/verify-slack-request.ts

@@ -1,10 +1,11 @@
 import { createHmac, timingSafeEqual } from 'crypto';
-import { stringify } from 'qs';
-import { Response, NextFunction } from 'express';
 
+import { Response, NextFunction } from 'express';
 import createError from 'http-errors';
-import loggerFactory from '../utils/logger';
+import { stringify } from 'qs';
+
 import { RequestFromSlack } from '../interfaces/request-from-slack';
+import loggerFactory from '../utils/logger';
 
 const logger = loggerFactory('@growi/slack:middlewares:verify-slack-request');
 

+ 4 - 3
packages/slack/src/utils/check-communicable.ts

@@ -1,11 +1,12 @@
-import axios, { AxiosError } from 'axios';
 
 import { WebClient } from '@slack/web-api';
+import axios, { AxiosError } from 'axios';
 
-import { generateWebClient } from './webclient-factory';
 import { ConnectionStatus } from '../interfaces/connection-status';
-import { requiredScopes } from './required-scopes';
+
 import { markdownSectionBlock } from './block-kit-builder';
+import { requiredScopes } from './required-scopes';
+import { generateWebClient } from './webclient-factory';
 
 /**
  * Check whether the HTTP server responds or not.

+ 3 - 1
packages/slack/src/utils/interaction-payload-accessor.ts

@@ -1,6 +1,8 @@
 import assert from 'assert';
-import { IInteractionPayloadAccessor } from '../interfaces/request-from-slack';
+
 import { IChannel } from '../interfaces/channel';
+import { IInteractionPayloadAccessor } from '../interfaces/request-from-slack';
+
 import loggerFactory from './logger';
 
 const logger = loggerFactory('@growi/slack:utils:interaction-payload-accessor');

+ 2 - 1
packages/slack/src/utils/post-ephemeral-errors.ts

@@ -1,7 +1,8 @@
 import { WebAPICallResult } from '@slack/web-api';
-import { respond } from './response-url';
 
 import { markdownSectionBlock } from './block-kit-builder';
+import { respond } from './response-url';
+
 
 export const respondRejectedErrors = async(
     rejectedResults: PromiseRejectedResult[],

+ 2 - 1
packages/slack/src/utils/respond-util-factory.ts

@@ -1,7 +1,8 @@
 import axios from 'axios';
 import urljoin from 'url-join';
-import { RespondBodyForResponseUrl } from '../interfaces/response-url';
+
 import { IRespondUtil } from '../interfaces/respond-util';
+import { RespondBodyForResponseUrl } from '../interfaces/response-url';
 
 type AxiosOptions = {
   headers?: {

+ 8 - 7
packages/slackbot-proxy/src/Server.ts

@@ -1,26 +1,27 @@
-import { Configuration, Inject, InjectorService } from '@tsed/di';
-import { HttpServer, PlatformApplication } from '@tsed/common';
 import '@tsed/platform-express'; // !! DO NOT MODIFY !!
 import '@tsed/typeorm'; // !! DO NOT MODIFY !! -- https://github.com/tsedio/tsed/issues/1332#issuecomment-837840612
 import '@tsed/swagger';
 
+import { createTerminus } from '@godaddy/terminus';
+import { HttpServer, PlatformApplication } from '@tsed/common';
+import { Configuration, Inject, InjectorService } from '@tsed/di';
 import bodyParser from 'body-parser';
 import compress from 'compression';
 import cookieParser from 'cookie-parser';
-import methodOverride from 'method-override';
-import helmet from 'helmet';
 import { Express } from 'express';
 import expressBunyanLogger from 'express-bunyan-logger';
-
+import helmet from 'helmet';
+import methodOverride from 'method-override';
 import { ConnectionOptions, getConnectionManager } from 'typeorm';
-import { createTerminus } from '@godaddy/terminus';
 
 import swaggerSettingsForDev from '~/config/swagger/config.dev';
 import swaggerSettingsForProd from '~/config/swagger/config.prod';
+import loggerFactory from '~/utils/logger';
+
 import { GlobalHttpErrorHandlingMiddleware } from './middlewares/GlobalHttpErrorHandlingMiddleware';
+
 import './filters/CustomHttpErrorFilter';
 import './filters/ResourceNotFoundFilter';
-import loggerFactory from '~/utils/logger';
 
 export const rootDir = __dirname;
 const isProduction = process.env.NODE_ENV === 'production';

+ 9 - 12
packages/slackbot-proxy/src/controllers/growi-to-slack.ts

@@ -1,28 +1,25 @@
+import {
+  verifyGrowiToSlackRequest, getConnectionStatuses, getConnectionStatus, REQUEST_TIMEOUT_FOR_PTOG, generateWebClient, BlockKitRequest,
+} from '@growi/slack';
+import { ErrorCode, WebAPICallResult } from '@slack/web-api';
 import {
   Controller, Get, Post, Inject, Req, Res, UseBefore, PathParams, Put, QueryParams,
 } from '@tsed/common';
 import axios from 'axios';
-import createError from 'http-errors';
 import { addHours } from 'date-fns';
+import createError from 'http-errors';
 
-import { ErrorCode, WebAPICallResult } from '@slack/web-api';
-
-import {
-  verifyGrowiToSlackRequest, getConnectionStatuses, getConnectionStatus, REQUEST_TIMEOUT_FOR_PTOG, generateWebClient, BlockKitRequest,
-} from '@growi/slack';
-
-import { WebclientRes, AddWebclientResponseToRes } from '~/middlewares/growi-to-slack/add-webclient-response-to-res';
 
 import { GrowiReq } from '~/interfaces/growi-to-slack/growi-req';
+import { WebclientRes, AddWebclientResponseToRes } from '~/middlewares/growi-to-slack/add-webclient-response-to-res';
 import { InstallationRepository } from '~/repositories/installation';
-import { RelationRepository } from '~/repositories/relation';
 import { OrderRepository } from '~/repositories/order';
-
+import { RelationRepository } from '~/repositories/relation';
 import { InstallerService } from '~/services/InstallerService';
-import loggerFactory from '~/utils/logger';
-import { ViewInteractionPayloadDelegator } from '~/services/growi-uri-injector/ViewInteractionPayloadDelegator';
 import { ActionsBlockPayloadDelegator } from '~/services/growi-uri-injector/ActionsBlockPayloadDelegator';
 import { SectionBlockPayloadDelegator } from '~/services/growi-uri-injector/SectionBlockPayloadDelegator';
+import { ViewInteractionPayloadDelegator } from '~/services/growi-uri-injector/ViewInteractionPayloadDelegator';
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('slackbot-proxy:controllers:growi-to-slack');

+ 11 - 13
packages/slackbot-proxy/src/controllers/slack.ts

@@ -1,11 +1,3 @@
-import {
-  Controller, Get, Inject, PlatformResponse, Post, Req, Res, UseBefore,
-} from '@tsed/common';
-
-import axios from 'axios';
-
-import { WebAPICallResult } from '@slack/web-api';
-import { Installation } from '@slack/oauth';
 
 
 import {
@@ -14,23 +6,29 @@ import {
   parseSlackInteractionRequest, verifySlackRequest,
   respond, supportedGrowiCommands, IChannelOptionalId,
 } from '@growi/slack';
+import { Installation } from '@slack/oauth';
+import { WebAPICallResult } from '@slack/web-api';
+import {
+  Controller, Get, Inject, PlatformResponse, Post, Req, Res, UseBefore,
+} from '@tsed/common';
+import axios from 'axios';
 
 import { Relation } from '~/entities/relation';
 import { SlackOauthReq } from '~/interfaces/slack-to-growi/slack-oauth-req';
-import { InstallationRepository } from '~/repositories/installation';
-import { RelationRepository } from '~/repositories/relation';
-import { OrderRepository } from '~/repositories/order';
 import { AddSigningSecretToReq } from '~/middlewares/slack-to-growi/add-signing-secret-to-req';
 import {
   AuthorizeCommandMiddleware, AuthorizeInteractionMiddleware, AuthorizeEventsMiddleware,
 } from '~/middlewares/slack-to-growi/authorizer';
-import { UrlVerificationMiddleware } from '~/middlewares/slack-to-growi/url-verification';
 import { ExtractGrowiUriFromReq } from '~/middlewares/slack-to-growi/extract-growi-uri-from-req';
+import { UrlVerificationMiddleware } from '~/middlewares/slack-to-growi/url-verification';
+import { InstallationRepository } from '~/repositories/installation';
+import { OrderRepository } from '~/repositories/order';
+import { RelationRepository } from '~/repositories/relation';
 import { InstallerService } from '~/services/InstallerService';
-import { SelectGrowiService } from '~/services/SelectGrowiService';
 import { LinkSharedService } from '~/services/LinkSharedService';
 import { RegisterService } from '~/services/RegisterService';
 import { RelationsService } from '~/services/RelationsService';
+import { SelectGrowiService } from '~/services/SelectGrowiService';
 import { UnregisterService } from '~/services/UnregisterService';
 import loggerFactory from '~/utils/logger';
 import { postInstallSuccessMessage, postWelcomeMessageOnce } from '~/utils/welcome-message';

+ 1 - 2
packages/slackbot-proxy/src/controllers/top.ts

@@ -1,10 +1,9 @@
+import { requiredScopes } from '@growi/slack';
 import {
   Controller, Get, Inject, View,
 } from '@tsed/common';
-
 import readPkgUp from 'read-pkg-up';
 
-import { requiredScopes } from '@growi/slack';
 import { InstallerService } from '~/services/InstallerService';
 
 const isOfficialMode = process.env.OFFICIAL_MODE === 'true';

+ 1 - 1
packages/slackbot-proxy/src/entities/installation.ts

@@ -1,3 +1,4 @@
+import { Installation as SlackInstallation } from '@slack/oauth';
 import {
   Required,
 } from '@tsed/schema';
@@ -5,7 +6,6 @@ import {
   Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn,
 } from 'typeorm';
 
-import { Installation as SlackInstallation } from '@slack/oauth';
 
 @Entity()
 export class Installation {

+ 1 - 0
packages/slackbot-proxy/src/entities/order.ts

@@ -1,6 +1,7 @@
 import {
   Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn, ManyToOne,
 } from 'typeorm';
+
 import { Installation } from './installation';
 
 @Entity()

+ 1 - 0
packages/slackbot-proxy/src/entities/relation.ts

@@ -2,6 +2,7 @@ import { differenceInMilliseconds } from 'date-fns';
 import {
   Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn, ManyToOne, Index,
 } from 'typeorm';
+
 import { Installation } from './installation';
 
 export interface PermissionSettingsInterface {

+ 1 - 1
packages/slackbot-proxy/src/interfaces/growi-to-slack/growi-req.ts

@@ -1,4 +1,4 @@
-import { Req } from '@tsed/common';
 import { RequestFromGrowi } from '@growi/slack';
+import { Req } from '@tsed/common';
 
 export type GrowiReq = Req & RequestFromGrowi;

+ 0 - 1
packages/slackbot-proxy/src/middlewares/GlobalHttpErrorHandlingMiddleware.ts

@@ -1,7 +1,6 @@
 import {
   Err, Middleware, Next, PlatformContext, PlatformResponse,
 } from '@tsed/common';
-
 import { HttpError, isHttpError } from 'http-errors';
 
 @Middleware()

+ 0 - 2
packages/slackbot-proxy/src/middlewares/slack-to-growi/authorizer.ts

@@ -2,9 +2,7 @@ import { AuthorizeResult, InstallationQuery } from '@slack/oauth';
 import {
   IMiddleware, Inject, Middleware, Next, Req, Res,
 } from '@tsed/common';
-
 import Logger from 'bunyan';
-
 import createError from 'http-errors';
 
 import { SlackOauthReq } from '~/interfaces/slack-to-growi/slack-oauth-req';

+ 1 - 1
packages/slackbot-proxy/src/middlewares/slack-to-growi/extract-growi-uri-from-req.ts

@@ -3,8 +3,8 @@ import {
 } from '@tsed/common';
 
 import { SlackOauthReq } from '~/interfaces/slack-to-growi/slack-oauth-req';
-import { ViewInteractionPayloadDelegator } from '~/services/growi-uri-injector/ViewInteractionPayloadDelegator';
 import { ActionsBlockPayloadDelegator } from '~/services/growi-uri-injector/ActionsBlockPayloadDelegator';
+import { ViewInteractionPayloadDelegator } from '~/services/growi-uri-injector/ViewInteractionPayloadDelegator';
 
 
 @Middleware()

+ 1 - 2
packages/slackbot-proxy/src/middlewares/slack-to-growi/join-to-conversation.ts

@@ -2,10 +2,9 @@ import { generateWebClient } from '@growi/slack';
 import {
   IMiddleware, Middleware, Req,
 } from '@tsed/common';
-
 import Logger from 'bunyan';
-import { SlackOauthReq } from '~/interfaces/slack-to-growi/slack-oauth-req';
 
+import { SlackOauthReq } from '~/interfaces/slack-to-growi/slack-oauth-req';
 import loggerFactory from '~/utils/logger';
 
 const logger: Logger = loggerFactory('slackbot-proxy:middlewares:JoinToConversationsMiddleware');

+ 1 - 2
packages/slackbot-proxy/src/middlewares/slack-to-growi/parse-interaction-req.ts

@@ -1,9 +1,8 @@
+import { RequestFromSlack } from '@growi/slack';
 import {
   IMiddleware, Middleware, Next, Req,
 } from '@tsed/common';
 
-import { RequestFromSlack } from '@growi/slack';
-
 
 @Middleware()
 export class ParseInteractionPayloadMiddleare implements IMiddleware {

+ 1 - 0
packages/slackbot-proxy/src/middlewares/slack-to-growi/url-verification.ts

@@ -1,6 +1,7 @@
 import {
   IMiddleware, Middleware, Req, Res, Next,
 } from '@tsed/common';
+
 import { SlackOauthReq } from '~/interfaces/slack-to-growi/slack-oauth-req';
 
 

+ 0 - 1
packages/slackbot-proxy/src/models/errors.ts

@@ -1,5 +1,4 @@
 import ExtensibleCustomError from 'extensible-custom-error';
-
 import { HttpError } from 'http-errors';
 
 export class InvalidUrlError extends ExtensibleCustomError {

+ 4 - 3
packages/slackbot-proxy/src/services/LinkSharedService.ts

@@ -1,9 +1,10 @@
-import axios from 'axios';
-import { Inject, Service } from '@tsed/di';
 import { GrowiEventProcessor, REQUEST_TIMEOUT_FOR_PTOG } from '@growi/slack';
 import { WebClient } from '@slack/web-api';
-import loggerFactory from '~/utils/logger';
+import { Inject, Service } from '@tsed/di';
+import axios from 'axios';
+
 import { RelationRepository } from '~/repositories/relation';
+import loggerFactory from '~/utils/logger';
 
 const logger = loggerFactory('slackbot-proxy:services:LinkSharedService');
 

+ 9 - 6
packages/slackbot-proxy/src/services/RegisterService.ts

@@ -1,18 +1,21 @@
-import { Inject, Service } from '@tsed/di';
-import {
-  WebClient, LogLevel, Block, ConversationsSelect,
-} from '@slack/web-api';
 import {
   markdownSectionBlock, markdownHeaderBlock, inputSectionBlock, GrowiCommand, inputBlock,
   respond, GrowiCommandProcessor, GrowiInteractionProcessor,
   getInteractionIdRegexpFromCommandName, InteractionHandledResult, InteractionPayloadAccessor,
 } from '@growi/slack';
 import { AuthorizeResult } from '@slack/oauth';
-import { OrderRepository } from '~/repositories/order';
-import { InvalidUrlError } from '../models/errors';
+import {
+  WebClient, LogLevel, Block, ConversationsSelect,
+} from '@slack/web-api';
+import { Inject, Service } from '@tsed/di';
+
+
 import { InstallationRepository } from '~/repositories/installation';
+import { OrderRepository } from '~/repositories/order';
 import loggerFactory from '~/utils/logger';
 
+import { InvalidUrlError } from '../models/errors';
+
 const logger = loggerFactory('slackbot-proxy:services:RegisterService');
 
 const isProduction = process.env.NODE_ENV === 'production';

+ 3 - 5
packages/slackbot-proxy/src/services/RelationsService.ts

@@ -1,14 +1,12 @@
+import {
+  REQUEST_TIMEOUT_FOR_PTOG, getSupportedGrowiActionsRegExp, IChannelOptionalId, permissionParser,
+} from '@growi/slack';
 import { Inject, Service } from '@tsed/di';
-
 import axios from 'axios';
 import { addHours } from 'date-fns';
 
-import {
-  REQUEST_TIMEOUT_FOR_PTOG, getSupportedGrowiActionsRegExp, IChannelOptionalId, permissionParser,
-} from '@growi/slack';
 import { Relation, PermissionSettingsInterface } from '~/entities/relation';
 import { RelationRepository } from '~/repositories/relation';
-
 import loggerFactory from '~/utils/logger';
 
 const logger = loggerFactory('slackbot-proxy:services:RelationsService');

+ 2 - 2
packages/slackbot-proxy/src/services/SelectGrowiService.ts

@@ -1,4 +1,3 @@
-import { Inject, Service } from '@tsed/di';
 
 import {
   getInteractionIdRegexpFromCommandName,
@@ -6,11 +5,12 @@ import {
   InteractionHandledResult, markdownSectionBlock, replaceOriginal, respond, InteractionPayloadAccessor,
 } from '@growi/slack';
 import { AuthorizeResult } from '@slack/oauth';
+import { Inject, Service } from '@tsed/di';
 
 import { Installation } from '~/entities/installation';
 import { Relation } from '~/entities/relation';
-import { RelationRepository } from '~/repositories/relation';
 import { InstallationRepository } from '~/repositories/installation';
+import { RelationRepository } from '~/repositories/relation';
 import loggerFactory from '~/utils/logger';
 
 const logger = loggerFactory('slackbot-proxy:services:UnregisterService');

+ 2 - 2
packages/slackbot-proxy/src/services/SystemInformationService.ts

@@ -1,12 +1,12 @@
 import { Inject, Service } from '@tsed/di';
-
 import readPkgUp from 'read-pkg-up';
 
 import { SystemInformation } from '~/entities/system-information';
 import { SystemInformationRepository } from '~/repositories/system-information';
-import { RelationsService } from './RelationsService';
 import loggerFactory from '~/utils/logger';
 
+import { RelationsService } from './RelationsService';
+
 const logger = loggerFactory('slackbot-proxy:services:SystemInformationService');
 
 @Service()

+ 5 - 4
packages/slackbot-proxy/src/services/UnregisterService.ts

@@ -1,16 +1,17 @@
-import axios from 'axios';
-import { Inject, Service } from '@tsed/di';
-import { MultiStaticSelect } from '@slack/web-api';
 import {
   actionsBlock, buttonElement, getInteractionIdRegexpFromCommandName,
   GrowiCommand, GrowiCommandProcessor, GrowiInteractionProcessor,
   inputBlock, InteractionHandledResult, markdownSectionBlock, respond, InteractionPayloadAccessor, replaceOriginal,
 } from '@growi/slack';
 import { AuthorizeResult } from '@slack/oauth';
+import { MultiStaticSelect } from '@slack/web-api';
+import { Inject, Service } from '@tsed/di';
+import axios from 'axios';
 import { DeleteResult } from 'typeorm';
-import { RelationRepository } from '~/repositories/relation';
+
 import { Installation } from '~/entities/installation';
 import { InstallationRepository } from '~/repositories/installation';
+import { RelationRepository } from '~/repositories/relation';
 import loggerFactory from '~/utils/logger';
 
 const logger = loggerFactory('slackbot-proxy:services:UnregisterService');

+ 2 - 0
packages/slackbot-proxy/src/services/growi-uri-injector/ActionsBlockPayloadDelegator.ts

@@ -1,7 +1,9 @@
 import { Inject, OnInit, Service } from '@tsed/di';
+
 import {
   GrowiUriInjector, GrowiUriWithOriginalData, TypedBlock,
 } from '~/interfaces/growi-uri-injector';
+
 import { ButtonActionPayloadDelegator } from './block-elements/ButtonActionPayloadDelegator';
 import { CheckboxesActionPayloadDelegator } from './block-elements/CheckboxesActionPayloadDelegator';
 

+ 2 - 0
packages/slackbot-proxy/src/services/growi-uri-injector/SectionBlockPayloadDelegator.ts

@@ -1,7 +1,9 @@
 import { Inject, OnInit, Service } from '@tsed/di';
+
 import {
   GrowiUriInjector, GrowiUriWithOriginalData, TypedBlock,
 } from '~/interfaces/growi-uri-injector';
+
 import { ButtonActionPayloadDelegator } from './block-elements/ButtonActionPayloadDelegator';
 import { CheckboxesActionPayloadDelegator } from './block-elements/CheckboxesActionPayloadDelegator';
 

+ 1 - 0
packages/slackbot-proxy/src/services/growi-uri-injector/ViewInteractionPayloadDelegator.ts

@@ -1,4 +1,5 @@
 import { Service } from '@tsed/di';
+
 import {
   GrowiUriInjector, GrowiUriWithOriginalData, isGrowiUriWithOriginalData, TypedBlock,
 } from '~/interfaces/growi-uri-injector';

+ 1 - 0
packages/slackbot-proxy/src/services/growi-uri-injector/block-elements/ButtonActionPayloadDelegator.ts

@@ -1,4 +1,5 @@
 import { Service } from '@tsed/di';
+
 import { GrowiUriWithOriginalData, GrowiUriInjector, TypedBlock } from '~/interfaces/growi-uri-injector';
 
 

+ 1 - 0
packages/slackbot-proxy/src/services/growi-uri-injector/block-elements/CheckboxesActionPayloadDelegator.ts

@@ -1,4 +1,5 @@
 import { Service } from '@tsed/di';
+
 import { GrowiUriWithOriginalData, GrowiUriInjector, TypedBlock } from '~/interfaces/growi-uri-injector';
 
 

+ 1 - 1
packages/slackbot-proxy/src/utils/welcome-message.ts

@@ -1,5 +1,5 @@
-import { ChatPostMessageResponse, WebClient } from '@slack/web-api';
 import { markdownSectionBlock } from '@growi/slack';
+import { ChatPostMessageResponse, WebClient } from '@slack/web-api';
 
 export const postWelcomeMessageOnce = async(client: WebClient, channel: string): Promise<void|ChatPostMessageResponse> => {
   const history = await client.conversations.history({

+ 2 - 0
packages/ui/src/components/Attachment/Attachment.jsx

@@ -1,6 +1,8 @@
 import React from 'react';
+
 import PropTypes from 'prop-types';
 
+
 import { UserPicture } from '../User/UserPicture';
 
 export class Attachment extends React.Component {

+ 3 - 1
packages/ui/src/components/PagePath/PageListMeta.tsx

@@ -1,6 +1,8 @@
 import React, { FC } from 'react';
-import { templateChecker, pagePathUtils } from '@growi/core';
+
 import { IPageHasId } from '@growi/app/src/interfaces/page';
+import { templateChecker, pagePathUtils } from '@growi/core';
+
 import { FootstampIcon } from '../SearchPage/FootstampIcon';
 
 const { isTopPage } = pagePathUtils;

+ 3 - 2
packages/ui/src/components/User/UserPicture.jsx

@@ -1,8 +1,9 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 
-import { UncontrolledTooltip } from 'reactstrap';
 import { pagePathUtils } from '@growi/core';
+import PropTypes from 'prop-types';
+import { UncontrolledTooltip } from 'reactstrap';
+
 
 const { userPageRoot } = pagePathUtils;