Quellcode durchsuchen

update import lines

Yuki Takei vor 4 Jahren
Ursprung
Commit
b5778767b3
35 geänderte Dateien mit 37 neuen und 36 gelöschten Zeilen
  1. 2 1
      packages/app/src/server/middlewares/access-token-parser.js
  2. 1 1
      packages/app/src/server/middlewares/admin-required.js
  3. 1 1
      packages/app/src/server/middlewares/auto-reconnect-to-search.js
  4. 2 1
      packages/app/src/server/middlewares/certify-shared-file.js
  5. 1 1
      packages/app/src/server/middlewares/certify-shared-page.js
  6. 1 1
      packages/app/src/server/middlewares/csrf.js
  7. 1 1
      packages/app/src/server/middlewares/login-required.js
  8. 1 1
      packages/app/src/server/middlewares/safe-redirect.js
  9. 1 1
      packages/app/src/server/routes/apiv3/app-settings.js
  10. 1 1
      packages/app/src/server/routes/apiv3/attachment.js
  11. 1 1
      packages/app/src/server/routes/apiv3/customize-setting.js
  12. 1 1
      packages/app/src/server/routes/apiv3/docs.js
  13. 1 1
      packages/app/src/server/routes/apiv3/export.js
  14. 1 1
      packages/app/src/server/routes/apiv3/healthcheck.js
  15. 1 1
      packages/app/src/server/routes/apiv3/import.js
  16. 1 1
      packages/app/src/server/routes/apiv3/index.js
  17. 1 1
      packages/app/src/server/routes/apiv3/markdown-setting.js
  18. 1 1
      packages/app/src/server/routes/apiv3/mongo.js
  19. 1 1
      packages/app/src/server/routes/apiv3/notification-setting.js
  20. 1 1
      packages/app/src/server/routes/apiv3/page.js
  21. 1 1
      packages/app/src/server/routes/apiv3/pages.js
  22. 1 1
      packages/app/src/server/routes/apiv3/personal-setting.js
  23. 1 1
      packages/app/src/server/routes/apiv3/revisions.js
  24. 1 1
      packages/app/src/server/routes/apiv3/search.js
  25. 1 1
      packages/app/src/server/routes/apiv3/security-setting.js
  26. 1 1
      packages/app/src/server/routes/apiv3/share-links.js
  27. 1 1
      packages/app/src/server/routes/apiv3/slack-integration-settings.js
  28. 1 1
      packages/app/src/server/routes/apiv3/slack-integration.js
  29. 1 1
      packages/app/src/server/routes/apiv3/staffs.js
  30. 1 1
      packages/app/src/server/routes/apiv3/statistics.js
  31. 1 1
      packages/app/src/server/routes/apiv3/user-group-relation.js
  32. 1 1
      packages/app/src/server/routes/apiv3/user-group.js
  33. 1 1
      packages/app/src/server/routes/apiv3/users.js
  34. 1 2
      packages/app/src/server/service/export.js
  35. 1 1
      packages/app/src/server/service/search-reconnect-context/reconnect-context.js

+ 2 - 1
packages/app/src/server/middlewares/access-token-parser.js

@@ -1,4 +1,5 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
+
 const { serializeUserSecurely } = require('../models/serializers/user-serializer');
 const { serializeUserSecurely } = require('../models/serializers/user-serializer');
 
 
 const logger = loggerFactory('growi:middleware:access-token-parser');
 const logger = loggerFactory('growi:middleware:access-token-parser');

+ 1 - 1
packages/app/src/server/middlewares/admin-required.js

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:middleware:admin-required');
 const logger = loggerFactory('growi:middleware:admin-required');
 
 

+ 1 - 1
packages/app/src/server/middlewares/auto-reconnect-to-search.js

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const { ReconnectContext, nextTick } = require('../service/search-reconnect-context/reconnect-context');
 const { ReconnectContext, nextTick } = require('../service/search-reconnect-context/reconnect-context');
 
 

+ 2 - 1
packages/app/src/server/middlewares/certify-shared-file.js

@@ -1,5 +1,6 @@
+import loggerFactory from '~/utils/logger';
+
 const url = require('url');
 const url = require('url');
-const loggerFactory = require('~/utils/logger');
 
 
 const logger = loggerFactory('growi:middleware:certify-shared-fire');
 const logger = loggerFactory('growi:middleware:certify-shared-fire');
 
 

+ 1 - 1
packages/app/src/server/middlewares/certify-shared-page.js

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:middleware:certify-shared-page');
 const logger = loggerFactory('growi:middleware:certify-shared-page');
 
 

+ 1 - 1
packages/app/src/server/middlewares/csrf.js

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:middleware:csrf');
 const logger = loggerFactory('growi:middleware:csrf');
 
 

+ 1 - 1
packages/app/src/server/middlewares/login-required.js

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:middleware:login-required');
 const logger = loggerFactory('growi:middleware:login-required');
 
 

+ 1 - 1
packages/app/src/server/middlewares/safe-redirect.js

@@ -4,7 +4,7 @@
  * Usage: app.use(require('middlewares/safe-redirect')(['example.com', 'some.example.com:8080']))
  * Usage: app.use(require('middlewares/safe-redirect')(['example.com', 'some.example.com:8080']))
  */
  */
 
 
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:middleware:safe-redirect');
 const logger = loggerFactory('growi:middleware:safe-redirect');
 
 

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

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3:app-settings');
 const logger = loggerFactory('growi:routes:apiv3:app-settings');
 
 

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

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3:attachment'); // eslint-disable-line no-unused-vars
 const logger = loggerFactory('growi:routes:apiv3:attachment'); // eslint-disable-line no-unused-vars
 
 

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

@@ -1,5 +1,5 @@
 /* eslint-disable no-unused-vars */
 /* eslint-disable no-unused-vars */
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3:customize-setting');
 const logger = loggerFactory('growi:routes:apiv3:customize-setting');
 
 

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

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3:docs'); // eslint-disable-line no-unused-vars
 const logger = loggerFactory('growi:routes:apiv3:docs'); // eslint-disable-line no-unused-vars
 
 

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

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3:export');
 const logger = loggerFactory('growi:routes:apiv3:export');
 const fs = require('fs');
 const fs = require('fs');

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

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3:healthcheck'); // eslint-disable-line no-unused-vars
 const logger = loggerFactory('growi:routes:apiv3:healthcheck'); // eslint-disable-line no-unused-vars
 
 

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

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3:import'); // eslint-disable-line no-unused-vars
 const logger = loggerFactory('growi:routes:apiv3:import'); // eslint-disable-line no-unused-vars
 
 

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

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3'); // eslint-disable-line no-unused-vars
 const logger = loggerFactory('growi:routes:apiv3'); // eslint-disable-line no-unused-vars
 
 

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

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3:markdown-setting');
 const logger = loggerFactory('growi:routes:apiv3:markdown-setting');
 
 

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

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3:mongo'); // eslint-disable-line no-unused-vars
 const logger = loggerFactory('growi:routes:apiv3:mongo'); // eslint-disable-line no-unused-vars
 
 

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

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 // eslint-disable-next-line no-unused-vars
 // eslint-disable-next-line no-unused-vars
 const logger = loggerFactory('growi:routes:apiv3:notification-setting');
 const logger = loggerFactory('growi:routes:apiv3:notification-setting');

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

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3:page'); // eslint-disable-line no-unused-vars
 const logger = loggerFactory('growi:routes:apiv3:page'); // eslint-disable-line no-unused-vars
 
 

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

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3:pages'); // eslint-disable-line no-unused-vars
 const logger = loggerFactory('growi:routes:apiv3:pages'); // eslint-disable-line no-unused-vars
 const express = require('express');
 const express = require('express');

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

@@ -1,5 +1,5 @@
 /* eslint-disable no-unused-vars */
 /* eslint-disable no-unused-vars */
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3:personal-setting');
 const logger = loggerFactory('growi:routes:apiv3:personal-setting');
 
 

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

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3:pages');
 const logger = loggerFactory('growi:routes:apiv3:pages');
 
 

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

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3:search'); // eslint-disable-line no-unused-vars
 const logger = loggerFactory('growi:routes:apiv3:search'); // eslint-disable-line no-unused-vars
 
 

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

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3:security-setting');
 const logger = loggerFactory('growi:routes:apiv3:security-setting');
 
 

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

@@ -1,6 +1,6 @@
 // TODO remove this setting after implemented all
 // TODO remove this setting after implemented all
 /* eslint-disable no-unused-vars */
 /* eslint-disable no-unused-vars */
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3:share-links');
 const logger = loggerFactory('growi:routes:apiv3:share-links');
 
 

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

@@ -3,7 +3,7 @@ const express = require('express');
 const { body, query } = require('express-validator');
 const { body, query } = require('express-validator');
 const axios = require('axios');
 const axios = require('axios');
 const urljoin = require('url-join');
 const urljoin = require('url-join');
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const { getConnectionStatus, getConnectionStatuses, sendSuccessMessage } = require('@growi/slack');
 const { getConnectionStatus, getConnectionStatuses, sendSuccessMessage } = require('@growi/slack');
 
 

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

@@ -2,7 +2,7 @@ const express = require('express');
 const mongoose = require('mongoose');
 const mongoose = require('mongoose');
 const urljoin = require('url-join');
 const urljoin = require('url-join');
 
 
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const { verifySlackRequest, generateWebClient } = require('@growi/slack');
 const { verifySlackRequest, generateWebClient } = require('@growi/slack');
 
 

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

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3:staffs'); // eslint-disable-line no-unused-vars
 const logger = loggerFactory('growi:routes:apiv3:staffs'); // eslint-disable-line no-unused-vars
 
 

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

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3:healthcheck'); // eslint-disable-line no-unused-vars
 const logger = loggerFactory('growi:routes:apiv3:healthcheck'); // eslint-disable-line no-unused-vars
 
 

+ 1 - 1
packages/app/src/server/routes/apiv3/user-group-relation.js

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3:user-group-relation'); // eslint-disable-line no-unused-vars
 const logger = loggerFactory('growi:routes:apiv3:user-group-relation'); // eslint-disable-line no-unused-vars
 
 

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

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3:user-group'); // eslint-disable-line no-unused-vars
 const logger = loggerFactory('growi:routes:apiv3:user-group'); // eslint-disable-line no-unused-vars
 
 

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

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:routes:apiv3:user-group');
 const logger = loggerFactory('growi:routes:apiv3:user-group');
 
 

+ 1 - 2
packages/app/src/server/service/export.js

@@ -1,4 +1,5 @@
 import loggerFactory from '~/utils/logger';
 import loggerFactory from '~/utils/logger';
+import { toArrayIfNot } from '~/utils/array-utils';
 
 
 const logger = loggerFactory('growi:services:ExportService'); // eslint-disable-line no-unused-vars
 const logger = loggerFactory('growi:services:ExportService'); // eslint-disable-line no-unused-vars
 
 
@@ -10,8 +11,6 @@ const streamToPromise = require('stream-to-promise');
 const archiver = require('archiver');
 const archiver = require('archiver');
 const ConfigLoader = require('../service/config-loader');
 const ConfigLoader = require('../service/config-loader');
 
 
-const toArrayIfNot = require('../../lib/util/toArrayIfNot');
-
 const CollectionProgressingStatus = require('../models/vo/collection-progressing-status');
 const CollectionProgressingStatus = require('../models/vo/collection-progressing-status');
 
 
 class ExportProgressingStatus extends CollectionProgressingStatus {
 class ExportProgressingStatus extends CollectionProgressingStatus {

+ 1 - 1
packages/app/src/server/service/search-reconnect-context/reconnect-context.js

@@ -1,4 +1,4 @@
-const loggerFactory = require('~/utils/logger');
+import loggerFactory from '~/utils/logger';
 
 
 const logger = loggerFactory('growi:service:search-reconnect-context:reconnect-context');
 const logger = loggerFactory('growi:service:search-reconnect-context:reconnect-context');