update import lines

packages/app/src/components/PageList/PageListMeta.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import templateChecker from '@commons/util/template-checker';
+import templateChecker from '~/utils/template-checker';
 import { isTopPage } from '~/utils/path-utils';
 
 export default class PageListMeta extends React.Component {

packages/app/src/server/crowi/express-init.js

@@ -22,7 +22,7 @@ module.exports = function(crowi, app) {
   const registerSafeRedirect = require('../middlewares/safe-redirect')();
   const injectCurrentuserToLocalvars = require('../middlewares/inject-currentuser-to-localvars')();
   const autoReconnectToS2sMsgServer = require('../middlewares/auto-reconnect-to-s2s-msg-server')(crowi);
-  const { listLocaleIds } = require('@commons/util/locale-utils');
+  const { listLocaleIds } = require('~/utils/locale-utils');
 
   const avoidSessionRoutes = require('../routes/avoid-session-routes');
   const i18nUserSettingDetector = require('../util/i18nUserSettingDetector');

packages/app/src/server/models/user.js

@@ -1,4 +1,5 @@
 /* eslint-disable no-use-before-define */
+import loggerFactory from '~/utils/logger';
 
 const debug = require('debug')('growi:models:user');
 const mongoose = require('mongoose');
@@ -9,11 +10,12 @@ const md5 = require('md5');
 const ObjectId = mongoose.Schema.Types.ObjectId;
 const crypto = require('crypto');
 
-const { listLocaleIds, migrateDeprecatedLocaleId } = require('@commons/util/locale-utils');
-const logger = require('~/utils/logger')('growi:models:user');
+const { listLocaleIds, migrateDeprecatedLocaleId } = require('~/utils/locale-utils');
 
 const { omitInsecureAttributes } = require('./serializers/user-serializer');
 
+const logger = loggerFactory('growi:models:user');
+
 module.exports = function(crowi) {
   const STATUS_REGISTERED = 1;
   const STATUS_ACTIVE = 2;

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

@@ -7,7 +7,7 @@ const debug = require('debug')('growi:routes:admin');
 const express = require('express');
 
 const { pathUtils } = require('growi-commons');
-const { listLocaleIds } = require('@commons/util/locale-utils');
+const { listLocaleIds } = require('~/utils/locale-utils');
 
 const router = express.Router();
 

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

@@ -7,7 +7,7 @@ const express = require('express');
 
 const passport = require('passport');
 
-const { listLocaleIds } = require('@commons/util/locale-utils');
+const { listLocaleIds } = require('~/utils/locale-utils');
 
 const router = express.Router();
 

packages/app/src/server/service/user-notification/index.js

@@ -1,4 +1,4 @@
-const toArrayFromCsv = require('@commons/util/to-array-from-csv');
+const toArrayFromCsv = require('~/utils/to-array-from-csv');
 
 /**
  * service class of UserNotification

packages/app/src/test/config/migrate.test.js

@@ -15,7 +15,7 @@ describe('config/migrate.js', () => {
     test(`when 'MONGO_URI' is '${MONGO_URI}`, () => {
 
       // mock for mongoose-utils
-      jest.doMock('@commons/util/mongoose-utils', () => {
+      jest.doMock('~/utils/mongoose-utils', () => {
         return {
           getMongoUri: () => {
             return MONGO_URI;
@@ -25,7 +25,7 @@ describe('config/migrate.js', () => {
 
       const { mongoUri, mongodb } = require('@root/config/migrate');
 
-      jest.dontMock('@commons/util/mongoose-utils');
+      jest.dontMock('~/utils/mongoose-utils');
 
       expect(mongoUri).toBe(MONGO_URI);
       expect(mongodb.url).toBe(expectedUrl);

packages/app/src/test/libs/to-array-from-csv.test.js

@@ -1,4 +1,4 @@
-const toArrayFromCsv = require('@commons/util/to-array-from-csv');
+const toArrayFromCsv = require('~/utils/to-array-from-csv');
 
 describe('To array from csv', () => {
 

packages/app/src/test/setup.js

@@ -1,6 +1,6 @@
 const mongoose = require('mongoose');
 
-const { getMongoUri, mongoOptions } = require('@commons/util/mongoose-utils');
+const { getMongoUri, mongoOptions } = require('~/utils/mongoose-utils');
 
 mongoose.Promise = global.Promise;
 

packages/app/src/utils/locale-utils.ts

@@ -1,6 +1,6 @@
-const fs = require('fs');
+import fs from 'fs';
 
-const helpers = require('./helpers');
+import { resolveFromRoot } from '~/utils/project-dir-utils';
 
 const MIGRATE_LOCALE_MAP = {
   en: 'en_US',
@@ -11,7 +11,7 @@ const MIGRATE_LOCALE_MAP = {
  * List locales dirents
  */
 function listLocaleDirents() {
-  const allDirents = fs.readdirSync(helpers.root('resource/locales'), { withFileTypes: true });
+  const allDirents = fs.readdirSync(resolveFromRoot('../../../resource/locales'), { withFileTypes: true });
   return allDirents
     .filter(dirent => dirent.isDirectory());
 }