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

move next-i18next.config.ts to config

Yuki Takei 3 лет назад
Родитель
Сommit
9dd22c585e

+ 1 - 1
packages/app/.eslintignore

@@ -1,10 +1,10 @@
 /dist/**
 /transpiled/**
 /public/**
+/config/next-i18next.config.js
 /src/client/legacy/thirdparty-js/**
 /src/client/util/reveal/plugins/markdown.js
 /src/linter-checker/**
-/src/next-i18next.config.js
 /src/utils/next.config.utils.js
 /src-obsolete/**
 /tmp/**

+ 1 - 1
packages/app/.gitignore

@@ -17,7 +17,7 @@ test/cypress/videos
 /tmp/
 
 # transpiled configuration files for production build
-/src/next-i18next.config.js
+/config/next-i18next.config.js
 /src/utils/next.config.utils.js
 
 # dist (for GROWI v4.x and below)

+ 0 - 0
packages/app/src/next-i18next.config.ts → packages/app/config/next-i18next.config.ts


+ 1 - 3
packages/app/next.config.js

@@ -53,9 +53,7 @@ const setupTranspileModules = () => {
 
 module.exports = async(phase, { defaultConfig }) => {
 
-  const { i18n, localePath } = phase === PHASE_PRODUCTION_SERVER
-    ? require('./dist/next-i18next.config')
-    : require('./src/next-i18next.config');
+  const { i18n, localePath } = require('./config/next-i18next.config');
 
   /** @type {import('next').NextConfig} */
   const nextConfig = {

+ 1 - 1
packages/app/src/client/util/i18n.js

@@ -17,7 +17,7 @@ Object.values(locales).forEach((locale) => {
 });
 
 /*
-* Note: This file will be deleted. use "~/next-i18next.config" instead
+* Note: This file will be deleted. use "^/config/next-i18next.config" instead
 */
 // extract metadata list from 'public/static/locales/${locale}/meta.json'
 export const localeMetadatas = Object.values(locales).map(locale => locale.meta);

+ 2 - 1
packages/app/src/components/Admin/App/AppSetting.jsx

@@ -3,9 +3,10 @@ import React, { useCallback } from 'react';
 import { useTranslation, i18n } from 'next-i18next';
 import PropTypes from 'prop-types';
 
+import { i18n as i18nConfig } from '^/config/next-i18next.config';
+
 import AdminAppContainer from '~/client/services/AdminAppContainer';
 import { toastSuccess, toastError } from '~/client/util/apiNotification';
-import { i18n as i18nConfig } from '~/next-i18next.config';
 import loggerFactory from '~/utils/logger';
 
 

+ 2 - 1
packages/app/src/pages/_app.page.tsx

@@ -10,7 +10,8 @@ import '~/styles/style-next.scss';
 // import '~/styles/theme/default.scss';
 // import InterceptorManager from '~/service/interceptor-manager';
 
-import * as nextI18nConfig from '../next-i18next.config';
+import * as nextI18nConfig from '^/config/next-i18next.config';
+
 import { useI18nextHMR } from '../services/i18next-hmr';
 import {
   useAppTitle, useConfidential, useGrowiTheme, useGrowiVersion, useSiteUrl,

+ 2 - 1
packages/app/src/pages/utils/commons.ts

@@ -2,10 +2,11 @@ import { DevidedPagePath, Lang } from '@growi/core';
 import { GetServerSideProps, GetServerSidePropsContext } from 'next';
 import { SSRConfig, UserConfig } from 'next-i18next';
 
+import * as nextI18NextConfig from '^/config/next-i18next.config';
+
 import { CrowiRequest } from '~/interfaces/crowi-request';
 import { GrowiThemes } from '~/interfaces/theme';
 
-import * as nextI18NextConfig from '../../next-i18next.config';
 
 export type CommonProps = {
   namespacesRequired: string[], // i18next

+ 2 - 1
packages/app/src/server/crowi/dev.js

@@ -1,6 +1,7 @@
 import path from 'path';
 
-import { i18n } from '~/next-i18next.config';
+import { i18n } from '^/config/next-i18next.config';
+
 import loggerFactory from '~/utils/logger';
 
 import nextFactory from '../routes/next';

+ 2 - 1
packages/app/src/server/crowi/express-init.js

@@ -1,7 +1,8 @@
 import csrf from 'csurf';
 import mongoose from 'mongoose';
 
-import { i18n, localePath } from '~/next-i18next.config';
+import { i18n, localePath } from '^/config/next-i18next.config';
+
 import loggerFactory from '~/utils/logger';
 
 const logger = loggerFactory('growi:crowi:express-init');

+ 2 - 1
packages/app/src/server/models/user.js

@@ -1,5 +1,6 @@
 /* eslint-disable no-use-before-define */
-import { i18n } from '~/next-i18next.config';
+import { i18n } from '^/config/next-i18next.config';
+
 import { generateGravatarSrc } from '~/utils/gravatar';
 import loggerFactory from '~/utils/logger';
 

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

@@ -1,7 +1,8 @@
 import { body } from 'express-validator';
 
+import { i18n } from '^/config/next-i18next.config';
+
 import { SupportedAction } from '~/interfaces/activity';
-import { i18n } from '~/next-i18next.config';
 import loggerFactory from '~/utils/logger';
 
 import { generateAddActivityMiddleware } from '../../middlewares/add-activity';

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

@@ -1,7 +1,8 @@
 import { body } from 'express-validator';
 
+import { i18n } from '^/config/next-i18next.config';
+
 import { SupportedAction } from '~/interfaces/activity';
-import { i18n } from '~/next-i18next.config';
 import loggerFactory from '~/utils/logger';
 
 import { generateAddActivityMiddleware } from '../../middlewares/add-activity';

+ 1 - 1
packages/app/tsconfig.base.json

@@ -5,6 +5,6 @@
     "jsx": "preserve",
     "incremental": true
   },
-  "include": ["next-env.d.ts", "src/**/*"],
+  "include": ["next-env.d.ts", "config/**/*", "src/**/*"],
   "exclude": ["node_modules"]
 }

+ 3 - 4
packages/app/tsconfig.build.next.config.json

@@ -10,9 +10,8 @@
       "^/*": ["./*"]
     }
   },
-  "include": [
-    "src/next-i18next.config.ts",
+  "files": [
+    "config/next-i18next.config.ts",
     "src/utils/next.config.utils.ts"
-  ],
-  "exclude": ["node_modules"]
+  ]
 }